1 This patch addresses the issue reported in bug 15809845. |
1 This patch is Solaris-specific and thus will not be contributed upstream. |
2 15809845 - SUNBT7191272 imagemagick perl module compiled with wrong RUNPATH |
2 |
3 -------------------------------------------------------------------------------- |
3 --- ImageMagick-6.8.3/PerlMagick/Makefile.am.~1~ 2013-02-13 15:22:54.000000000 -0800 |
4 --- ImageMagick-6.7.8/PerlMagick/Makefile.am Sun Dec 18 17:54:26 2011 |
4 +++ ImageMagick-6.8.3/PerlMagick/Makefile.am 2015-02-10 20:35:39.222565738 -0800 |
5 +++ ImageMagick-6.7.8/PerlMagick/Makefile.am Thu Oct 4 00:11:45 2012 |
5 @@ -59,7 +59,7 @@ |
6 @@ -50,7 +50,7 @@ |
|
7 |
6 |
8 install-exec-perl: $(PERLMAKEFILE) |
7 install-exec-perl: $(PERLMAKEFILE) |
9 ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
8 ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
10 - $(MAKE) CC='@CC@' install ) |
9 - $(MAKE) CC='@CC@' install ) |
11 + $(MAKE) CC='@CC@' LD_RUN_PATH="" install ) |
10 + $(MAKE) CC='@CC@' LD_RUN_PATH="" install ) |
12 |
11 |
13 all-perl: perl-sources |
12 all-perl: perl-sources |
14 |
13 |
15 @@ -58,7 +58,8 @@ |
14 @@ -67,7 +67,8 @@ |
16 echo "Uninstall not supported for PerlMagick" |
15 echo "Uninstall not supported for PerlMagick" |
17 |
16 |
18 check-perl: $(PERLMAKEFILE) |
17 check-perl: $(PERLMAKEFILE) |
19 - cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
18 - cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
20 + cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh \ |
19 + cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh \ |
21 + $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
20 + $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
22 |
21 |
23 perl-build: $(PERLMAKEFILE) |
22 perl-build: $(PERLMAKEFILE) |
24 ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' ) |
23 ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' ) |
25 --- ImageMagick-6.7.8/Makefile.in Sun Jul 22 05:35:45 2012 |
24 --- ImageMagick-6.8.3/Makefile.in.~1~ 2013-02-25 00:55:13.000000000 -0800 |
26 +++ ImageMagick-6.7.8/Makefile.in Thu Oct 4 00:15:46 2012 |
25 +++ ImageMagick-6.8.3/Makefile.in 2015-02-10 20:37:32.843393109 -0800 |
27 @@ -10584,7 +10584,7 @@ |
26 @@ -10472,7 +10472,7 @@ |
28 |
27 |
29 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE) |
28 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE) |
30 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
29 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
31 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ $(MAKE) CC='@CC@' install ) |
30 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ $(MAKE) CC='@CC@' install ) |
32 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ $(MAKE) CC='@CC@' LD_RUN_PATH="" install ) |
31 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ $(MAKE) CC='@CC@' LD_RUN_PATH="" install ) |
33 |
32 |
34 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources |
33 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources |
35 |
34 |
36 @@ -10592,7 +10592,7 @@ |
35 @@ -10480,7 +10480,7 @@ |
37 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ echo "Uninstall not supported for PerlMagick" |
36 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ echo "Uninstall not supported for PerlMagick" |
38 |
37 |
39 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE) |
38 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE) |
40 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
39 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
41 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
40 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' LD_RUN_PATH="" test |