From 3a08c401f298095840a2aee9079845f5ff434410 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Sat, 23 Apr 2011 19:43:17 -0700 Subject: perl: upgrade from 5.12.2 to 5.12.3 And changed the perl tarball URL to more stable cpan location. Signed-off-by: Nitin A Kamble --- .../perl/perl-5.12.3/Makefile.SH.patch | 290 +++++++++++++++++++++ 1 file changed, 290 insertions(+) create mode 100644 meta/recipes-devtools/perl/perl-5.12.3/Makefile.SH.patch (limited to 'meta/recipes-devtools/perl/perl-5.12.3/Makefile.SH.patch') diff --git a/meta/recipes-devtools/perl/perl-5.12.3/Makefile.SH.patch b/meta/recipes-devtools/perl/perl-5.12.3/Makefile.SH.patch new file mode 100644 index 000000000..6371a3d5a --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.3/Makefile.SH.patch @@ -0,0 +1,290 @@ +Upstream-Status:Inappropriate [embedded specific] + +Index: perl-5.12.3/Makefile.SH +=================================================================== +--- perl-5.12.3.orig/Makefile.SH ++++ perl-5.12.3/Makefile.SH +@@ -50,12 +50,12 @@ case "$useshrplib" in + true) + # Prefix all runs of 'miniperl' and 'perl' with + # $ldlibpth so that ./perl finds *this* shared libperl. +- case "$LD_LIBRARY_PATH" in +- '') +- ldlibpth="LD_LIBRARY_PATH=`pwd`";; +- *) +- ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";; +- esac ++# case "$LD_LIBRARY_PATH" in ++# '') ++# ldlibpth="LD_LIBRARY_PATH=`pwd`";; ++# *) ++# ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";; ++# esac + + pldlflags="$cccdlflags" + static_ldflags='' +@@ -133,7 +133,8 @@ true) + ldlibpth='' + ;; + *) +- eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\"" ++# We compile in the library path in OE from cross-compile, so lets not do this ++# eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\"" + ;; + esac + # Strip off any trailing :'s +@@ -154,18 +155,7 @@ true) + # INSTALL file, under "Building a shared perl library". + # If there is no pre-existing $libperl, we don't need + # to do anything further. +- if test -f $archlib/CORE/$libperl; then +- rm -f preload +- cat <<'EOT' > preload +-#! /bin/sh +-lib=$1 +-shift +-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" +-exec "$@" +-EOT +- chmod 755 preload +- ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" +- fi ++ echo linux libraries overwritten by cross-compile patches + ;; + os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" + ;; +@@ -557,9 +547,19 @@ splintfiles = $(c1) + .c.s: + $(CCCMDSRC) -S $*.c + +-all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make +- @echo " "; +- @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." ++#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make ++# @echo " "; ++# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." ++ ++all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(unidatafiles) ++ ++more: $(generated_pods) $(private) $(public) ++ ++more2: $(dynamic_ext) ++ ++more3: $(nonxs_ext) ++ ++more4: extras.make + + .PHONY: all translators utilities + +@@ -567,16 +567,16 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $( + # by make_patchnum.pl. + git_version.h: lib/Config_git.pl + +-lib/Config_git.pl: $(MINIPERL_EXE) make_patchnum.pl ++lib/Config_git.pl: make_patchnum.pl + $(MINIPERL) make_patchnum.pl + + # make sure that we recompile perl.c if the git version changes + perl$(OBJ_EXT): git_version.h + +-translators: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE ++translators: $(CONFIGPM) $(dynamic_ext) FORCE + @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all + +-utilities: $(MINIPERL_EXE) $(CONFIGPM) $(plextract) FORCE ++utilities: $(CONFIGPM) $(plextract) FORCE + @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all + + +@@ -754,7 +754,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI + true) + $spitshell >>$Makefile <<'!NO!SUBS!' + rm -f $@ +- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) ++ $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5 + !NO!SUBS! + case "$osname" in + aix) +@@ -795,7 +795,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX + $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) \ + $(mini_obj) \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs) +- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest ++ mv -f miniperl miniperl-target ++ ln -s hostperl miniperl ++# $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + next4*) +@@ -803,7 +805,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX + $(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) perlmini$(OBJ_EXT) opmini$(OBJ_EXT) + $(CC) -o $(MINIPERL_EXE) $(mini_obj) \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs) +- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest ++ mv -f miniperl miniperl-target ++ ln -s hostperl miniperl ++# $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + darwin*) +@@ -825,7 +829,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX + $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ + $(mini_obj) \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs) +- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest ++ mv -f miniperl miniperl-target ++ ln -s hostperl miniperl ++# $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + *) +@@ -835,7 +841,10 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX + $(LDLIBPTH) $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ + $(mini_obj) \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs) +- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest ++ ++ mv -f miniperl miniperl-target ++ ln -s hostperl miniperl ++# $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + esac +@@ -957,7 +966,7 @@ case "${osname}" in + catamount) + $spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' + .PHONY: makeppport +-makeppport: $(MINIPERL_EXE) $(CONFIGPM) $(nonxs_ext) ++makeppport: $(CONFIGPM) $(nonxs_ext) + $(MINIPERL) $(Icwd) mkppport + + !NO!SUBS! +@@ -977,29 +986,29 @@ esac + $spitshell >>$Makefile <<'!NO!SUBS!' + + .PHONY: preplibrary +-preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL) ++preplibrary: $(CONFIGPM) $(PREPLIBRARY_LIBPERL) + + $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD) + +-$(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git.pl ++$(CONFIGPOD): config.sh configpm Porting/Glossary lib/Config_git.pl + $(MINIPERL) configpm + +-lib/ExtUtils/Miniperl.pm: miniperlmain.c $(MINIPERL_EXE) minimod.pl $(CONFIGPM) ++lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM) + $(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm + +-$(plextract): $(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext) ++$(plextract): $(CONFIGPM) x2p/s2p $(dynamic_ext) + @-rm -f $@ + $(MINIPERL) $@.PL + +-x2p/s2p: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL ++x2p/s2p: $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL + cd x2p; $(LDLIBPTH) $(MAKE) s2p + +-lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl ++lib/buildcustomize.pl: write_buildcustomize.pl + $(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl + + unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data + +-uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) ++uni.data: $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) + $(MINIPERL) $(Icwd) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p + # Commented out so always runs, mktables looks at far more files than we + # can in this makefile to decide if needs to run or not +@@ -1008,21 +1017,21 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li + # $(PERL_EXE) and ext because buildtoc uses Text::Wrap uses re + # But also this ensures that all extensions are built before we try to scan + # them, which picks up Devel::PPPort's documentation. +-pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc +- $(RUN_PERL) -f -Ilib pod/buildtoc --build-toc -q ++pod/perltoc.pod: $(perltoc_pod_prereqs) $(ext) pod/buildtoc ++ $(MINIPERL) -f -Ilib pod/buildtoc --build-toc -q + + pod/perlapi.pod: pod/perlintern.pod + +-pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc ++pod/perlintern.pod: autodoc.pl embed.fnc + $(MINIPERL) autodoc.pl + +-pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST ++pod/perlmodlib.pod: pod/perlmodlib.PL MANIFEST + $(MINIPERL) $(Icwd) pod/perlmodlib.PL -q + + pod/perldelta.pod: pod/perl5123delta.pod + $(LNS) perl5123delta.pod pod/perldelta.pod + +-extra.pods: $(MINIPERL_EXE) ++extra.pods: + -@test ! -f extra.pods || rm -f `cat extra.pods` + -@rm -f extra.pods + -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ +@@ -1065,11 +1074,7 @@ no-install: + INSTALL_DEPENDENCE = all + + install.perl: $(INSTALL_DEPENDENCE) installperl +- $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) +- -@test ! -s extras.lst || $(MAKE) extras.install +- +-install.man: all installman +- $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) ++ ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) + + # XXX Experimental. Hardwired values, but useful for testing. + # Eventually Configure could ask for some of these values. +@@ -1166,16 +1171,16 @@ manicheck: FORCE + # + # DynaLoader may be needed for extensions that use Makefile.PL. + +-$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) ++$(DYNALOADER): lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) + $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) + +-d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) ++d_dummy $(dynamic_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) + $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic + +-s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE ++s_dummy $(static_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE + $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) + +-n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE ++n_dummy $(nonxs_ext): lib/buildcustomize.pl preplibrary FORCE + $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + !NO!SUBS! + +@@ -1373,10 +1378,10 @@ _test: + + test_prep_pre: preplibrary utilities $(nonxs_ext) + +-test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests ++test_prep: test_prep_pre $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests + cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) + +-test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) ++test_prep_reonly: $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) + $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic + cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) + +@@ -1467,7 +1472,7 @@ minitest.prep: + + # Can't depend on lib/Config.pm because that might be where miniperl + # is crashing. +-minitest: $(MINIPERL_EXE) minitest.prep ++minitest: minitest.prep + - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \ + && $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t