diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-05-27 21:04:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-05-27 21:04:11 +0000 |
| commit | 80785a10721e523029c27f264fca5a892cf68e36 (patch) | |
| tree | d33b51538db742a5d6f8df6b184b5531e8bf68ce /meta/packages/perl/perl-5.8.8/Makefile.SH.patch | |
| parent | bd4fd028a799e804d803eac14ccb9e164ecc4938 (diff) | |
| download | poky-80785a10721e523029c27f264fca5a892cf68e36.tar.gz | |
perl: 5.8.7 -> 5.8.8 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1785 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/perl/perl-5.8.8/Makefile.SH.patch')
| -rw-r--r-- | meta/packages/perl/perl-5.8.8/Makefile.SH.patch | 222 |
1 files changed, 222 insertions, 0 deletions
diff --git a/meta/packages/perl/perl-5.8.8/Makefile.SH.patch b/meta/packages/perl/perl-5.8.8/Makefile.SH.patch new file mode 100644 index 0000000000..c674ce9ee5 --- /dev/null +++ b/meta/packages/perl/perl-5.8.8/Makefile.SH.patch | |||
| @@ -0,0 +1,222 @@ | |||
| 1 | --- perl-5.8.8/Makefile.SH 2007/04/20 12:43:33 1.1 | ||
| 2 | +++ perl-5.8.8/Makefile.SH 2007/04/20 15:20:40 | ||
| 3 | @@ -129,18 +129,7 @@ | ||
| 4 | # INSTALL file, under "Building a shared perl library". | ||
| 5 | # If there is no pre-existing $libperl, we don't need | ||
| 6 | # to do anything further. | ||
| 7 | - if test -f $archlib/CORE/$libperl; then | ||
| 8 | - rm -f preload | ||
| 9 | - cat <<'EOT' > preload | ||
| 10 | -#! /bin/sh | ||
| 11 | -lib=$1 | ||
| 12 | -shift | ||
| 13 | -test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" | ||
| 14 | -exec "$@" | ||
| 15 | -EOT | ||
| 16 | - chmod 755 preload | ||
| 17 | - ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" | ||
| 18 | - fi | ||
| 19 | + echo linux libraries overwritten by cross-compile patches | ||
| 20 | ;; | ||
| 21 | os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" | ||
| 22 | ;; | ||
| 23 | @@ -401,9 +390,19 @@ | ||
| 24 | .c.s: | ||
| 25 | $(CCCMDSRC) -S $*.c | ||
| 26 | |||
| 27 | -all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make | ||
| 28 | - @echo " "; | ||
| 29 | - @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | ||
| 30 | +#all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make | ||
| 31 | +# @echo " "; | ||
| 32 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | ||
| 33 | + | ||
| 34 | +all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) | ||
| 35 | + | ||
| 36 | +more: extra.pods $(private) $(public) | ||
| 37 | + | ||
| 38 | +more2: $(dynamic_ext) | ||
| 39 | + | ||
| 40 | +more3: $(nonxs_ext) | ||
| 41 | + | ||
| 42 | +more4: extras.make | ||
| 43 | |||
| 44 | .PHONY: all compile translators utilities | ||
| 45 | |||
| 46 | @@ -413,10 +412,10 @@ | ||
| 47 | cd x2p; $(MAKE) compile; | ||
| 48 | cd pod; $(MAKE) compile; | ||
| 49 | |||
| 50 | -translators: miniperl$(EXE_EXT) $(CONFIGPM) FORCE | ||
| 51 | +translators: $(CONFIGPM) FORCE | ||
| 52 | @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all | ||
| 53 | |||
| 54 | -utilities: miniperl$(EXE_EXT) $(CONFIGPM) $(plextract) lib/lib.pm FORCE | ||
| 55 | +utilities: $(CONFIGPM) $(plextract) lib/lib.pm FORCE | ||
| 56 | @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all | ||
| 57 | |||
| 58 | |||
| 59 | @@ -550,7 +549,7 @@ | ||
| 60 | case "$useshrplib" in | ||
| 61 | true) | ||
| 62 | $spitshell >>Makefile <<'!NO!SUBS!' | ||
| 63 | - $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs) | ||
| 64 | + $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs) -Wl,-soname,libperl.so.5 | ||
| 65 | !NO!SUBS! | ||
| 66 | case "$osname" in | ||
| 67 | aix) | ||
| 68 | @@ -591,7 +590,9 @@ | ||
| 69 | $(CC) -o miniperl $(CLDFLAGS) \ | ||
| 70 | `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ | ||
| 71 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) | ||
| 72 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
| 73 | + mv -f miniperl miniperl-target | ||
| 74 | + ln -s hostperl miniperl | ||
| 75 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
| 76 | !NO!SUBS! | ||
| 77 | ;; | ||
| 78 | next4*) | ||
| 79 | @@ -599,7 +600,9 @@ | ||
| 80 | miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) | ||
| 81 | $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ | ||
| 82 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) | ||
| 83 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
| 84 | + mv -f miniperl miniperl-target | ||
| 85 | + ln -s hostperl miniperl | ||
| 86 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
| 87 | !NO!SUBS! | ||
| 88 | ;; | ||
| 89 | darwin*) | ||
| 90 | @@ -620,7 +623,9 @@ | ||
| 91 | -@rm -f miniperl.xok | ||
| 92 | $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \ | ||
| 93 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) | ||
| 94 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
| 95 | + mv -f miniperl miniperl-target | ||
| 96 | + ln -s hostperl miniperl | ||
| 97 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
| 98 | !NO!SUBS! | ||
| 99 | ;; | ||
| 100 | *) | ||
| 101 | @@ -629,7 +634,9 @@ | ||
| 102 | -@rm -f miniperl.xok | ||
| 103 | $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \ | ||
| 104 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) | ||
| 105 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
| 106 | + mv -f miniperl miniperl-target | ||
| 107 | + ln -s hostperl miniperl | ||
| 108 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
| 109 | !NO!SUBS! | ||
| 110 | ;; | ||
| 111 | esac | ||
| 112 | @@ -766,7 +773,7 @@ | ||
| 113 | # We need to autosplit in two steps because VOS can't handle so many args | ||
| 114 | # | ||
| 115 | .PHONY: preplibrary | ||
| 116 | -preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) | ||
| 117 | +preplibrary: $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) | ||
| 118 | @sh ./makedir lib/auto | ||
| 119 | @echo " AutoSplitting perl library" | ||
| 120 | $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ | ||
| 121 | @@ -775,35 +782,35 @@ | ||
| 122 | autosplit_lib_modules(@ARGV)' lib/*/*.pm | ||
| 123 | $(MAKE) lib/re.pm | ||
| 124 | |||
| 125 | -lib/Config.pod: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary | ||
| 126 | +lib/Config.pod: config.sh configpm Porting/Glossary | ||
| 127 | $(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl lib/Config.pm | ||
| 128 | |||
| 129 | $(CONFIGPM): lib/Config.pod | ||
| 130 | |||
| 131 | -lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM) | ||
| 132 | +lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM) | ||
| 133 | $(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm | ||
| 134 | |||
| 135 | lib/re.pm: ext/re/re.pm | ||
| 136 | cp ext/re/re.pm lib/re.pm | ||
| 137 | |||
| 138 | -$(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p | ||
| 139 | +$(plextract): $(CONFIGPM) x2p/s2p | ||
| 140 | @-rm -f $@ | ||
| 141 | $(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL | ||
| 142 | |||
| 143 | -x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p.PL | ||
| 144 | +x2p/s2p: $(CONFIGPM) x2p/s2p.PL | ||
| 145 | cd x2p; $(LDLIBPTH) $(MAKE) s2p | ||
| 146 | |||
| 147 | -lib/lib.pm: miniperl$(EXE_EXT) $(CONFIGPM) | ||
| 148 | +lib/lib.pm: $(CONFIGPM) | ||
| 149 | @-rm -f $@ | ||
| 150 | $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL | ||
| 151 | |||
| 152 | unidatafiles $(unidatafiles): uni.data | ||
| 153 | |||
| 154 | -uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables | ||
| 155 | +uni.data: $(CONFIGPM) lib/unicore/mktables | ||
| 156 | cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w | ||
| 157 | touch uni.data | ||
| 158 | |||
| 159 | -extra.pods: miniperl$(EXE_EXT) | ||
| 160 | +extra.pods: | ||
| 161 | -@test -f extra.pods && rm -f `cat extra.pods` | ||
| 162 | -@rm -f extra.pods | ||
| 163 | -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ | ||
| 164 | @@ -850,18 +857,7 @@ | ||
| 165 | INSTALL_DEPENDENCE = all | ||
| 166 | |||
| 167 | install.perl: $(INSTALL_DEPENDENCE) installperl | ||
| 168 | - if [ -n "$(COMPILE)" ]; \ | ||
| 169 | - then \ | ||
| 170 | - cd utils; $(MAKE) compile; \ | ||
| 171 | - cd ../x2p; $(MAKE) compile; \ | ||
| 172 | - cd ../pod; $(MAKE) compile; \ | ||
| 173 | - else :; \ | ||
| 174 | - fi | ||
| 175 | - $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
| 176 | - $(MAKE) extras.install | ||
| 177 | - | ||
| 178 | -install.man: all installman | ||
| 179 | - $(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS) | ||
| 180 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl $(INSTALLFLAGS) $(STRIPFLAGS) | ||
| 181 | |||
| 182 | # XXX Experimental. Hardwired values, but useful for testing. | ||
| 183 | # Eventually Configure could ask for some of these values. | ||
| 184 | @@ -978,16 +974,16 @@ | ||
| 185 | # | ||
| 186 | # DynaLoader may be needed for extensions that use Makefile.PL. | ||
| 187 | |||
| 188 | -$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE | ||
| 189 | +$(DYNALOADER): preplibrary FORCE | ||
| 190 | @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | ||
| 191 | |||
| 192 | -d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | ||
| 193 | +d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE | ||
| 194 | @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | ||
| 195 | |||
| 196 | -s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | ||
| 197 | +s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE | ||
| 198 | @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | ||
| 199 | |||
| 200 | -n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | ||
| 201 | +n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE | ||
| 202 | @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | ||
| 203 | |||
| 204 | .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ | ||
| 205 | @@ -1125,7 +1121,7 @@ | ||
| 206 | |||
| 207 | test_prep_pre: preplibrary utilities $(nonxs_ext) | ||
| 208 | |||
| 209 | -test_prep: test_prep_pre miniperl$(EXE_EXT) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) | ||
| 210 | +test_prep: test_prep_pre $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) | ||
| 211 | PERL=./perl $(MAKE) _test_prep | ||
| 212 | |||
| 213 | _test_tty: | ||
| 214 | @@ -1238,7 +1234,7 @@ | ||
| 215 | |||
| 216 | # Can't depend on lib/Config.pm because that might be where miniperl | ||
| 217 | # is crashing. | ||
| 218 | -minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep | ||
| 219 | +minitest: lib/re.pm minitest.prep | ||
| 220 | - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ | ||
| 221 | && $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty | ||
| 222 | |||
