Mercurial Mercurial > upstream > oracle > userland-gate / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/imagemagick/patches/perl_LD_RUN_PATH.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 17 Mar 2014 23:04:26 -0700
changeset 1763 bda239c7cb8f
parent 1255 b7b09f9348b7
child 3798 c0f7a9f723ca
permissions -rw-r--r--
18307626 Request to integrate Horizon into userland (fix audit)

This patch addresses the issue reported in bug 15809845.
15809845 - SUNBT7191272 imagemagick perl module compiled with wrong RUNPATH 
--------------------------------------------------------------------------------
--- ImageMagick-6.7.8/PerlMagick/Makefile.am	Sun Dec 18 17:54:26 2011
+++ ImageMagick-6.7.8/PerlMagick/Makefile.am	Thu Oct  4 00:11:45 2012
@@ -50,7 +50,7 @@
 
 install-exec-perl: $(PERLMAKEFILE)
 	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
-	$(MAKE) CC='@CC@' install )
+	$(MAKE) CC='@CC@' LD_RUN_PATH="" install )
 
 all-perl: perl-sources
 
@@ -58,7 +58,8 @@
 	echo "Uninstall not supported for PerlMagick"
 
 check-perl: $(PERLMAKEFILE)
-	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test
+	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh \
+	$(MAKE) CC='@CC@' LD_RUN_PATH="" test
 
 perl-build: $(PERLMAKEFILE)
 	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' )
--- ImageMagick-6.7.8/Makefile.in	Sun Jul 22 05:35:45 2012
+++ ImageMagick-6.7.8/Makefile.in	Thu Oct  4 00:15:46 2012
@@ -10584,7 +10584,7 @@
 
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' install )
+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' LD_RUN_PATH="" install )
 
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources
 
@@ -10592,7 +10592,7 @@
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	echo "Uninstall not supported for PerlMagick"
 
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE)
-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test
+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' LD_RUN_PATH="" test
 
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@perl-build: $(PERLMAKEFILE)
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' )
upstream/oracle/userland-gate