From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/perl/perl-5.8.7/Makefile.SH.patch | 206 ++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 meta/packages/perl/perl-5.8.7/Makefile.SH.patch (limited to 'meta/packages/perl/perl-5.8.7/Makefile.SH.patch') diff --git a/meta/packages/perl/perl-5.8.7/Makefile.SH.patch b/meta/packages/perl/perl-5.8.7/Makefile.SH.patch new file mode 100644 index 0000000000..add2952d7e --- /dev/null +++ b/meta/packages/perl/perl-5.8.7/Makefile.SH.patch @@ -0,0 +1,206 @@ +--- perl-5.8.7/Makefile.SH.orig 2005-07-25 17:20:35.000000000 +0000 ++++ perl-5.8.7/Makefile.SH 2005-07-25 17:38:09.000000000 +0000 +@@ -129,18 +129,7 @@ + # 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" + ;; +@@ -377,9 +366,21 @@ + .c.s: + $(CCCMDSRC) -S $*.c + +-all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.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_EXT) extra.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_EXT) ++ mv miniperl miniperl-arm ++ ln -s hostperl miniperl ++ ++more: extra.pods $(private) $(unidatafiles) $(public) ++ ++more2: $(dynamic_ext) ++ ++more3: $(nonxs_ext) ++ ++more4: extras.make + + .PHONY: all compile translators utilities + +@@ -389,10 +390,10 @@ + cd x2p; $(MAKE) compile; + cd pod; $(MAKE) compile; + +-translators: miniperl$(EXE_EXT) $(CONFIGPM) FORCE ++translators: $(CONFIGPM) FORCE + @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all + +-utilities: miniperl$(EXE_EXT) $(CONFIGPM) $(plextract) lib/lib.pm FORCE ++utilities: $(CONFIGPM) $(plextract) lib/lib.pm FORCE + @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all + + +@@ -570,7 +571,7 @@ + $(CC) -o miniperl $(CLDFLAGS) \ + `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) +- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest ++# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + next4*) +@@ -578,7 +579,7 @@ + miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) + $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) +- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest ++# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + darwin*) +@@ -599,7 +600,7 @@ + -@rm -f miniperl.xok + $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) +- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest ++# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + *) +@@ -608,7 +609,7 @@ + -@rm -f miniperl.xok + $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) +- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest ++# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest + !NO!SUBS! + ;; + esac +@@ -745,7 +746,7 @@ + # We need to autosplit in two steps because VOS can't handle so many args + # + .PHONY: preplibrary +-preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) ++preplibrary: $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) + @sh ./makedir lib/auto + @echo " AutoSplitting perl library" + $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ +@@ -757,11 +758,11 @@ + # Take care to avoid modifying lib/Config.pm without reason + # (If trying to create a new port and having problems with the configpm script, + # try 'make minitest' and/or commenting out the tests at the end of configpm.) +-$(CONFIGPM): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary ++$(CONFIGPM): config.sh configpm Porting/Glossary + $(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl configpm.tmp + sh mv-if-diff configpm.tmp lib/Config.pm + +-lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM) ++lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM) + $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp + sh mv-if-diff minimod.tmp $@ + -touch lib/ExtUtils/Miniperl.pm +@@ -769,21 +770,21 @@ + lib/re.pm: ext/re/re.pm + cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm + +-$(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p ++$(plextract): $(CONFIGPM) x2p/s2p + @-rm -f $@ + $(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL + +-x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p.PL ++x2p/s2p: $(CONFIGPM) x2p/s2p.PL + cd x2p; $(LDLIBPTH) $(MAKE) s2p + +-lib/lib.pm: miniperl$(EXE_EXT) $(CONFIGPM) ++lib/lib.pm: $(CONFIGPM) + @-rm -f $@ + $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL + +-$(unidatafiles): miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables ++$(unidatafiles): $(CONFIGPM) lib/unicore/mktables + cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w + +-extra.pods: miniperl$(EXE_EXT) ++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 \ +@@ -830,18 +831,8 @@ + INSTALL_DEPENDENCE = all + + install.perl: $(INSTALL_DEPENDENCE) installperl +- if [ -n "$(COMPILE)" ]; \ +- then \ +- cd utils; $(MAKE) compile; \ +- cd ../x2p; $(MAKE) compile; \ +- cd ../pod; $(MAKE) compile; \ +- else :; \ +- fi +- $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) +- $(MAKE) extras.install +- +-install.man: all installman +- $(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS) ++ cp lib/Config.pm lib/Config_heavy.pl . ++ ./hostperl -I. installperl $(INSTALLFLAGS) $(STRIPFLAGS) + + # XXX Experimental. Hardwired values, but useful for testing. + # Eventually Configure could ask for some of these values. +@@ -957,16 +947,16 @@ + # + # DynaLoader may be needed for extensions that use Makefile.PL. + +-$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE ++$(DYNALOADER): preplibrary FORCE + @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + +-d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE ++d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + +-s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE ++s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + +-n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE ++n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE + @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + + .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ +@@ -1108,7 +1098,7 @@ + + test_prep_pre: preplibrary utilities $(nonxs_ext) + +-test_prep: test_prep_pre miniperl$(EXE_EXT) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) ++test_prep: test_prep_pre $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) + PERL=./perl $(MAKE) _test_prep + + _test_tty: +@@ -1221,7 +1211,7 @@ + + # Can't depend on lib/Config.pm because that might be where miniperl + # is crashing. +-minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep ++minitest: lib/re.pm minitest.prep + - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ + && $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t