1 This patch is Solaris-specific and thus will not be contributed upstream. |
|
2 |
|
3 --- ImageMagick-6.8.3/PerlMagick/Makefile.am.~1~ 2013-02-13 15:22:54.000000000 -0800 |
|
4 +++ ImageMagick-6.8.3/PerlMagick/Makefile.am 2015-02-10 20:35:39.222565738 -0800 |
|
5 @@ -59,7 +59,7 @@ |
|
6 |
|
7 install-exec-perl: $(PERLMAKEFILE) |
|
8 ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
|
9 - $(MAKE) CC='@CC@' install ) |
|
10 + $(MAKE) CC='@CC@' LD_RUN_PATH="" install ) |
|
11 |
|
12 all-perl: perl-sources |
|
13 |
|
14 @@ -67,7 +67,8 @@ |
|
15 echo "Uninstall not supported for PerlMagick" |
|
16 |
|
17 check-perl: $(PERLMAKEFILE) |
|
18 - cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
|
19 + cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh \ |
|
20 + $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
|
21 |
|
22 perl-build: $(PERLMAKEFILE) |
|
23 ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' ) |
|
24 --- ImageMagick-6.9.4/Makefile.in.~1~ 2016-05-09 10:29:28.000000000 -0700 |
|
25 +++ ImageMagick-6.9.4/Makefile.in 2016-05-10 09:07:02.124054239 -0700 |
|
26 @@ -11497,7 +11497,7 @@ |
|
27 |
|
28 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE) |
|
29 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
|
30 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ $(MAKE) CC='@CC@' install ) |
|
31 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ $(MAKE) CC='@CC@' LD_RUN_PATH="" install ) |
|
32 |
|
33 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources |
|
34 |
|
35 @@ -11505,7 +11505,7 @@ |
|
36 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ echo "Uninstall not supported for PerlMagick" |
|
37 |
|
38 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE) |
|
39 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
|
40 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
|
41 |
|
42 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@perl-build: $(PERLMAKEFILE) |
|
43 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' ) |
|