author | Vladimir Marek <Vladimir.Marek@oracle.com> |
Tue, 14 Aug 2012 16:39:52 +0200 | |
changeset 950 | cb53236158bb |
parent 949 | 269fd786651d |
child 951 | ca69cdd365db |
components/imagemagick/patches/perl_LD_RUN_PATH.patch | file | annotate | diff | comparison | revisions |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/imagemagick/patches/perl_LD_RUN_PATH.patch Tue Aug 14 16:39:52 2012 +0200 @@ -0,0 +1,45 @@ +diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am +--- a/PerlMagick/Makefile.am ++++ b/PerlMagick/Makefile.am [email protected]@ -46,16 +46,16 @@ + cd $(PERLMAGICK) && @[email protected] Makefile.PL $(PERL_MAKE_OPTIONS) + + install-exec-perl: $(PERLMAKEFILE) +- cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' install ++ cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' LD_RUN_PATH="" install + + all-perl: $(PERLMAKEFILE) +- cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' ++ cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' LD_RUN_PATH="" + + uninstall-exec-perl: $(PERLMAKEFILE) + echo "Uninstall not supported for PerlMagick" + + check-perl: $(PERLMAKEFILE) +- cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' test ++ cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' LD_RUN_PATH="" test + + else + if WITH_PERL_STATIC +--- ImageMagick-6.3.4/Makefile.in.old Tue Aug 14 16:37:42 2012 ++++ ImageMagick-6.3.4/Makefile.in Tue Aug 14 16:38:28 2012 [email protected]@ -10227,16 +10227,16 @@ + @[email protected]@[email protected] cd $(PERLMAGICK) && @[email protected] Makefile.PL $(PERL_MAKE_OPTIONS) + + @[email protected]@[email protected]: $(PERLMAKEFILE) [email protected][email protected]@[email protected] cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' install [email protected][email protected]@[email protected] cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' LD_RUN_PATH="" install + + @[email protected]@[email protected]: $(PERLMAKEFILE) [email protected][email protected]@[email protected] cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' [email protected][email protected]@[email protected] cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' LD_RUN_PATH="" + + @[email protected]@[email protected]: $(PERLMAKEFILE) + @[email protected]@[email protected] echo "Uninstall not supported for PerlMagick" + + @[email protected]@[email protected]: $(PERLMAKEFILE) [email protected][email protected]@[email protected] cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' test [email protected][email protected]@[email protected] cd $(PERLMAGICK) && $(MAKE) CC='@[email protected]' LD_RUN_PATH="" test + + @[email protected]@[email protected]@[email protected]$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) + @[email protected]@[email protected]@[email protected] cd $(PERLMAGICK) && @[email protected] Makefile.PL MAP_TARGET=$(PERLSTATICNAME) $(PERL_MAKE_OPTIONS)