Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7191272 imagemagick perl module compiled with wrong RUNPATH
authorVladimir Marek <Vladimir.Marek@oracle.com>
Tue, 14 Aug 2012 16:39:52 +0200
changeset 950 cb53236158bb
parent 949 269fd786651d
child 951 ca69cdd365db
7191272 imagemagick perl module compiled with wrong RUNPATH
components/imagemagick/patches/perl_LD_RUN_PATH.patch file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/imagemagick/patches/perl_LD_RUN_PATH.patch	Tue Aug 14 16:39:52 2012 +0200
@@ -0,0 +1,45 @@
+diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am
+--- a/PerlMagick/Makefile.am
++++ b/PerlMagick/Makefile.am
+@@ -46,16 +46,16 @@
+ 	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
+
+ install-exec-perl: $(PERLMAKEFILE)
+-	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
++	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" install
+
+ all-perl: $(PERLMAKEFILE)
+-	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
++	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH=""
+
+ uninstall-exec-perl: $(PERLMAKEFILE)
+ 	echo "Uninstall not supported for PerlMagick"
+
+ check-perl: $(PERLMAKEFILE)
+-	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' test
++	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" test
+
+ else
+ if WITH_PERL_STATIC
+--- ImageMagick-6.3.4/Makefile.in.old	Tue Aug 14 16:37:42 2012
++++ ImageMagick-6.3.4/Makefile.in	Tue Aug 14 16:38:28 2012
+@@ -10227,16 +10227,16 @@
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
+-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" install
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: $(PERLMAKEFILE)
+-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH=""
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@uninstall-exec-perl: $(PERLMAKEFILE)
+ @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) && $(MAKE) CC='@CC@' test
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" test
+ 
+ @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
+ @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL MAP_TARGET=$(PERLSTATICNAME) $(PERL_MAKE_OPTIONS)
upstream/oracle/userland-gate