Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/imagemagick/patches/perl_LD_RUN_PATH.patch
author Vladimir Marek <Vladimir.Marek@oracle.com>
Tue, 14 Aug 2012 16:39:52 +0200
changeset 950 cb53236158bb
child 1255 b7b09f9348b7
permissions -rw-r--r--
7191272 imagemagick perl module compiled with wrong RUNPATH
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
950
cb53236158bb 7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     1
 
diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am
cb53236158bb 7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     2
 
--- a/PerlMagick/Makefile.am
cb53236158bb 7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     3
 
+++ b/PerlMagick/Makefile.am
cb53236158bb 7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     4
 
@@ -46,16 +46,16 @@
cb53236158bb 7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     5
 
 	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
cb53236158bb 7191272 imagemagick perl module compiled with wrong RUNPATH
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     6
 












cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




     7


 install-exec-perl: $(PERLMAKEFILE)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




     8


-	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




     9


+	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" install













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    10














cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    11


 all-perl: $(PERLMAKEFILE)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    12


-	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    13


+	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH=""













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    14














cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    15


 uninstall-exec-perl: $(PERLMAKEFILE)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    16


 	echo "Uninstall not supported for PerlMagick"













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    17














cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    18


 check-perl: $(PERLMAKEFILE)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    19


-	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' test













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    20


+	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" test













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    21














cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    22


 else













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    23


 if WITH_PERL_STATIC













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    24


--- ImageMagick-6.3.4/Makefile.in.old	Tue Aug 14 16:37:42 2012













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    25


+++ ImageMagick-6.3.4/Makefile.in	Tue Aug 14 16:38:28 2012













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    26


@@ -10227,16 +10227,16 @@













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    27


 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    28


 













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    29


 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    30


-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    31


+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" install













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    32


 













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    33


 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: $(PERLMAKEFILE)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    34


-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    35


+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH=""













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    36


 













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    37


 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@uninstall-exec-perl: $(PERLMAKEFILE)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    38


 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	echo "Uninstall not supported for PerlMagick"













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    39


 













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    40


 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@check-perl: $(PERLMAKEFILE)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    41


-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' test













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    42


+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' LD_RUN_PATH="" test













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    43


 













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    44


 @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)













cb53236158bb
7191272 imagemagick perl module compiled with wrong RUNPATH



Vladimir Marek <Vladimir.Marek@oracle.com>


parents: 

diff
changeset




    45


 @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL MAP_TARGET=$(PERLSTATICNAME) $(PERL_MAKE_OPTIONS)















upstream/oracle/userland-gate