1 diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am |
1 This patch addresses the issue reported in bug 15809845. |
2 --- a/PerlMagick/Makefile.am |
2 15809845 - SUNBT7191272 imagemagick perl module compiled with wrong RUNPATH |
3 +++ b/PerlMagick/Makefile.am |
3 -------------------------------------------------------------------------------- |
4 @@ -46,16 +46,16 @@ |
4 --- ImageMagick-6.7.8/PerlMagick/Makefile.am Sun Dec 18 17:54:26 2011 |
5 cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) |
5 +++ ImageMagick-6.7.8/PerlMagick/Makefile.am Thu Oct 4 00:11:45 2012 |
6 |
6 @@ -50,7 +50,7 @@ |
|
7 |
7 install-exec-perl: $(PERLMAKEFILE) |
8 install-exec-perl: $(PERLMAKEFILE) |
8 - cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install |
9 ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
9 + cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" install |
10 - $(MAKE) CC='@CC@' install ) |
10 |
11 + $(MAKE) CC='@CC@' LD_RUN_PATH="" install ) |
11 all-perl: $(PERLMAKEFILE) |
12 |
12 - cd $(PERLMAGICK) && $(MAKE) CC='@CC@' |
13 all-perl: perl-sources |
13 + cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" |
14 |
14 |
15 @@ -58,7 +58,8 @@ |
15 uninstall-exec-perl: $(PERLMAKEFILE) |
|
16 echo "Uninstall not supported for PerlMagick" |
16 echo "Uninstall not supported for PerlMagick" |
17 |
17 |
18 check-perl: $(PERLMAKEFILE) |
18 check-perl: $(PERLMAKEFILE) |
19 - cd $(PERLMAGICK) && $(MAKE) CC='@CC@' test |
19 - cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
20 + cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
20 + cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh \ |
21 |
21 + $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
22 else |
22 |
23 if WITH_PERL_STATIC |
23 perl-build: $(PERLMAKEFILE) |
24 --- ImageMagick-6.3.4/Makefile.in.old Tue Aug 14 16:37:42 2012 |
24 ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' ) |
25 +++ ImageMagick-6.3.4/Makefile.in Tue Aug 14 16:38:28 2012 |
25 --- ImageMagick-6.7.8/Makefile.in Sun Jul 22 05:35:45 2012 |
26 @@ -10227,16 +10227,16 @@ |
26 +++ ImageMagick-6.7.8/Makefile.in Thu Oct 4 00:15:46 2012 |
27 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) |
27 @@ -10584,7 +10584,7 @@ |
28 |
28 |
29 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE) |
29 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE) |
30 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install |
30 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ |
31 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" install |
31 -@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 ) |
32 |
33 |
33 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: $(PERLMAKEFILE) |
34 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources |
34 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' |
|
35 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" |
|
36 |
35 |
37 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@uninstall-exec-perl: $(PERLMAKEFILE) |
36 @@ -10592,7 +10592,7 @@ |
38 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ echo "Uninstall not supported for PerlMagick" |
37 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ echo "Uninstall not supported for PerlMagick" |
39 |
38 |
40 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE) |
39 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE) |
41 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' test |
40 -@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test |
42 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
41 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' LD_RUN_PATH="" test |
43 |
42 |
44 @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) |
43 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@perl-build: $(PERLMAKEFILE) |
45 @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL MAP_TARGET=$(PERLSTATICNAME) $(PERL_MAKE_OPTIONS) |
44 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' ) |