components/imagemagick/patches/perl_LD_RUN_PATH.patch
author John Beck <John.Beck@Oracle.COM>
Thu, 12 Feb 2015 08:27:28 -0800
changeset 3798 c0f7a9f723ca
parent 1255 b7b09f9348b7
child 6020 83b3789e8d88
permissions -rw-r--r--
20192735 ImageMagick should gets its tests to run, with master results 20526097 add ASLR & 64-bit support to ImageMagick

This patch is Solaris-specific and thus will not be contributed upstream.

--- ImageMagick-6.8.3/PerlMagick/Makefile.am.~1~	2013-02-13 15:22:54.000000000 -0800
+++ ImageMagick-6.8.3/PerlMagick/Makefile.am	2015-02-10 20:35:39.222565738 -0800
@@ -59,7 +59,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
 
@@ -67,7 +67,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.8.3/Makefile.in.~1~	2013-02-25 00:55:13.000000000 -0800
+++ ImageMagick-6.8.3/Makefile.in	2015-02-10 20:37:32.843393109 -0800
@@ -10472,7 +10472,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
 
@@ -10480,7 +10480,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@' )