diff options
author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /meta/packages/perl/perl-5.8.7/Makefile.SH.patch | |
parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
download | poky-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/perl/perl-5.8.7/Makefile.SH.patch')
-rw-r--r-- | meta/packages/perl/perl-5.8.7/Makefile.SH.patch | 206 |
1 files changed, 206 insertions, 0 deletions
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 @@ | |||
1 | --- perl-5.8.7/Makefile.SH.orig 2005-07-25 17:20:35.000000000 +0000 | ||
2 | +++ perl-5.8.7/Makefile.SH 2005-07-25 17:38:09.000000000 +0000 | ||
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 | @@ -377,9 +366,21 @@ | ||
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 | + mv miniperl miniperl-arm | ||
36 | + ln -s hostperl miniperl | ||
37 | + | ||
38 | +more: extra.pods $(private) $(unidatafiles) $(public) | ||
39 | + | ||
40 | +more2: $(dynamic_ext) | ||
41 | + | ||
42 | +more3: $(nonxs_ext) | ||
43 | + | ||
44 | +more4: extras.make | ||
45 | |||
46 | .PHONY: all compile translators utilities | ||
47 | |||
48 | @@ -389,10 +390,10 @@ | ||
49 | cd x2p; $(MAKE) compile; | ||
50 | cd pod; $(MAKE) compile; | ||
51 | |||
52 | -translators: miniperl$(EXE_EXT) $(CONFIGPM) FORCE | ||
53 | +translators: $(CONFIGPM) FORCE | ||
54 | @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all | ||
55 | |||
56 | -utilities: miniperl$(EXE_EXT) $(CONFIGPM) $(plextract) lib/lib.pm FORCE | ||
57 | +utilities: $(CONFIGPM) $(plextract) lib/lib.pm FORCE | ||
58 | @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all | ||
59 | |||
60 | |||
61 | @@ -570,7 +571,7 @@ | ||
62 | $(CC) -o miniperl $(CLDFLAGS) \ | ||
63 | `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ | ||
64 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) | ||
65 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
66 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
67 | !NO!SUBS! | ||
68 | ;; | ||
69 | next4*) | ||
70 | @@ -578,7 +579,7 @@ | ||
71 | miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) | ||
72 | $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ | ||
73 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) | ||
74 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
75 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
76 | !NO!SUBS! | ||
77 | ;; | ||
78 | darwin*) | ||
79 | @@ -599,7 +600,7 @@ | ||
80 | -@rm -f miniperl.xok | ||
81 | $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \ | ||
82 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) | ||
83 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
84 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
85 | !NO!SUBS! | ||
86 | ;; | ||
87 | *) | ||
88 | @@ -608,7 +609,7 @@ | ||
89 | -@rm -f miniperl.xok | ||
90 | $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \ | ||
91 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) | ||
92 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
93 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | ||
94 | !NO!SUBS! | ||
95 | ;; | ||
96 | esac | ||
97 | @@ -745,7 +746,7 @@ | ||
98 | # We need to autosplit in two steps because VOS can't handle so many args | ||
99 | # | ||
100 | .PHONY: preplibrary | ||
101 | -preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) | ||
102 | +preplibrary: $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) | ||
103 | @sh ./makedir lib/auto | ||
104 | @echo " AutoSplitting perl library" | ||
105 | $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ | ||
106 | @@ -757,11 +758,11 @@ | ||
107 | # Take care to avoid modifying lib/Config.pm without reason | ||
108 | # (If trying to create a new port and having problems with the configpm script, | ||
109 | # try 'make minitest' and/or commenting out the tests at the end of configpm.) | ||
110 | -$(CONFIGPM): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary | ||
111 | +$(CONFIGPM): config.sh configpm Porting/Glossary | ||
112 | $(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl configpm.tmp | ||
113 | sh mv-if-diff configpm.tmp lib/Config.pm | ||
114 | |||
115 | -lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM) | ||
116 | +lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM) | ||
117 | $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp | ||
118 | sh mv-if-diff minimod.tmp $@ | ||
119 | -touch lib/ExtUtils/Miniperl.pm | ||
120 | @@ -769,21 +770,21 @@ | ||
121 | lib/re.pm: ext/re/re.pm | ||
122 | cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm | ||
123 | |||
124 | -$(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p | ||
125 | +$(plextract): $(CONFIGPM) x2p/s2p | ||
126 | @-rm -f $@ | ||
127 | $(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL | ||
128 | |||
129 | -x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p.PL | ||
130 | +x2p/s2p: $(CONFIGPM) x2p/s2p.PL | ||
131 | cd x2p; $(LDLIBPTH) $(MAKE) s2p | ||
132 | |||
133 | -lib/lib.pm: miniperl$(EXE_EXT) $(CONFIGPM) | ||
134 | +lib/lib.pm: $(CONFIGPM) | ||
135 | @-rm -f $@ | ||
136 | $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL | ||
137 | |||
138 | -$(unidatafiles): miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables | ||
139 | +$(unidatafiles): $(CONFIGPM) lib/unicore/mktables | ||
140 | cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w | ||
141 | |||
142 | -extra.pods: miniperl$(EXE_EXT) | ||
143 | +extra.pods: | ||
144 | -@test -f extra.pods && rm -f `cat extra.pods` | ||
145 | -@rm -f extra.pods | ||
146 | -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ | ||
147 | @@ -830,18 +831,8 @@ | ||
148 | INSTALL_DEPENDENCE = all | ||
149 | |||
150 | install.perl: $(INSTALL_DEPENDENCE) installperl | ||
151 | - if [ -n "$(COMPILE)" ]; \ | ||
152 | - then \ | ||
153 | - cd utils; $(MAKE) compile; \ | ||
154 | - cd ../x2p; $(MAKE) compile; \ | ||
155 | - cd ../pod; $(MAKE) compile; \ | ||
156 | - else :; \ | ||
157 | - fi | ||
158 | - $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
159 | - $(MAKE) extras.install | ||
160 | - | ||
161 | -install.man: all installman | ||
162 | - $(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS) | ||
163 | + cp lib/Config.pm lib/Config_heavy.pl . | ||
164 | + ./hostperl -I. installperl $(INSTALLFLAGS) $(STRIPFLAGS) | ||
165 | |||
166 | # XXX Experimental. Hardwired values, but useful for testing. | ||
167 | # Eventually Configure could ask for some of these values. | ||
168 | @@ -957,16 +947,16 @@ | ||
169 | # | ||
170 | # DynaLoader may be needed for extensions that use Makefile.PL. | ||
171 | |||
172 | -$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE | ||
173 | +$(DYNALOADER): preplibrary FORCE | ||
174 | @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | ||
175 | |||
176 | -d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | ||
177 | +d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE | ||
178 | @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | ||
179 | |||
180 | -s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | ||
181 | +s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE | ||
182 | @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | ||
183 | |||
184 | -n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | ||
185 | +n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE | ||
186 | @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | ||
187 | |||
188 | .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ | ||
189 | @@ -1108,7 +1098,7 @@ | ||
190 | |||
191 | test_prep_pre: preplibrary utilities $(nonxs_ext) | ||
192 | |||
193 | -test_prep: test_prep_pre miniperl$(EXE_EXT) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) | ||
194 | +test_prep: test_prep_pre $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) | ||
195 | PERL=./perl $(MAKE) _test_prep | ||
196 | |||
197 | _test_tty: | ||
198 | @@ -1221,7 +1211,7 @@ | ||
199 | |||
200 | # Can't depend on lib/Config.pm because that might be where miniperl | ||
201 | # is crashing. | ||
202 | -minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep | ||
203 | +minitest: lib/re.pm minitest.prep | ||
204 | - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ | ||
205 | && $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty | ||
206 | |||