components/imagemagick/patches/perl_LD_RUN_PATH.patch
changeset 3798 c0f7a9f723ca
parent 1255 b7b09f9348b7
child 6020 83b3789e8d88
--- a/components/imagemagick/patches/perl_LD_RUN_PATH.patch	Thu Feb 12 10:24:12 2015 -0800
+++ b/components/imagemagick/patches/perl_LD_RUN_PATH.patch	Thu Feb 12 08:27:28 2015 -0800
@@ -1,9 +1,8 @@
-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 @@
+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@' && \
@@ -12,7 +11,7 @@
  
  all-perl: perl-sources
  
-@@ -58,7 +58,8 @@
+@@ -67,7 +67,8 @@
  	echo "Uninstall not supported for PerlMagick"
  
  check-perl: $(PERLMAKEFILE)
@@ -22,9 +21,9 @@
  
  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 @@
+--- 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@' && \
@@ -33,7 +32,7 @@
  
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources
  
-@@ -10592,7 +10592,7 @@
+@@ -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)