summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch')
-rw-r--r--meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch288
1 files changed, 288 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch b/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch
new file mode 100644
index 0000000000..103fe978bc
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch
@@ -0,0 +1,288 @@
1Index: perl-5.12.2/Makefile.SH
2===================================================================
3--- perl-5.12.2.orig/Makefile.SH
4+++ perl-5.12.2/Makefile.SH
5@@ -50,12 +50,12 @@ case "$useshrplib" in
6 true)
7 # Prefix all runs of 'miniperl' and 'perl' with
8 # $ldlibpth so that ./perl finds *this* shared libperl.
9- case "$LD_LIBRARY_PATH" in
10- '')
11- ldlibpth="LD_LIBRARY_PATH=`pwd`";;
12- *)
13- ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
14- esac
15+# case "$LD_LIBRARY_PATH" in
16+# '')
17+# ldlibpth="LD_LIBRARY_PATH=`pwd`";;
18+# *)
19+# ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
20+# esac
21
22 pldlflags="$cccdlflags"
23 static_ldflags=''
24@@ -133,7 +133,8 @@ true)
25 ldlibpth=''
26 ;;
27 *)
28- eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
29+# We compile in the library path in OE from cross-compile, so lets not do this
30+# eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
31 ;;
32 esac
33 # Strip off any trailing :'s
34@@ -154,18 +155,7 @@ true)
35 # INSTALL file, under "Building a shared perl library".
36 # If there is no pre-existing $libperl, we don't need
37 # to do anything further.
38- if test -f $archlib/CORE/$libperl; then
39- rm -f preload
40- cat <<'EOT' > preload
41-#! /bin/sh
42-lib=$1
43-shift
44-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
45-exec "$@"
46-EOT
47- chmod 755 preload
48- ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
49- fi
50+ echo linux libraries overwritten by cross-compile patches
51 ;;
52 os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
53 ;;
54@@ -553,9 +543,19 @@ splintfiles = $(c1)
55 .c.s:
56 $(CCCMDSRC) -S $*.c
57
58-all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
59- @echo " ";
60- @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
61+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
62+# @echo " ";
63+# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
64+
65+all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(unidatafiles)
66+
67+more: $(generated_pods) $(private) $(public)
68+
69+more2: $(dynamic_ext)
70+
71+more3: $(nonxs_ext)
72+
73+more4: extras.make
74
75 .PHONY: all translators utilities
76
77@@ -563,16 +563,16 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) mi
78 # by make_patchnum.pl.
79 git_version.h: lib/Config_git.pl
80
81-lib/Config_git.pl: $(MINIPERL_EXE) make_patchnum.pl
82+lib/Config_git.pl: make_patchnum.pl
83 $(MINIPERL) make_patchnum.pl
84
85 # make sure that we recompile perl.c if the git version changes
86 perl$(OBJ_EXT): git_version.h
87
88-translators: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE
89+translators: $(CONFIGPM) $(dynamic_ext) FORCE
90 @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
91
92-utilities: $(MINIPERL_EXE) $(CONFIGPM) $(plextract) FORCE
93+utilities: $(CONFIGPM) $(plextract) FORCE
94 @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all
95
96
97@@ -747,7 +747,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI
98 true)
99 $spitshell >>$Makefile <<'!NO!SUBS!'
100 rm -f $@
101- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs)
102+ $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5
103 !NO!SUBS!
104 case "$osname" in
105 aix)
106@@ -788,7 +788,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
107 $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) \
108 $(mini_obj) \
109 miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
110- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
111+ mv -f miniperl miniperl-target
112+ ln -s hostperl miniperl
113+# $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
114 !NO!SUBS!
115 ;;
116 next4*)
117@@ -796,7 +798,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
118 $(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) perlmini$(OBJ_EXT) opmini$(OBJ_EXT)
119 $(CC) -o $(MINIPERL_EXE) $(mini_obj) \
120 miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
121- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
122+ mv -f miniperl miniperl-target
123+ ln -s hostperl miniperl
124+# $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
125 !NO!SUBS!
126 ;;
127 darwin*)
128@@ -818,7 +822,9 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
129 $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
130 $(mini_obj) \
131 miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
132- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
133+ mv -f miniperl miniperl-target
134+ ln -s hostperl miniperl
135+# $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
136 !NO!SUBS!
137 ;;
138 *)
139@@ -828,7 +834,10 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EX
140 $(LDLIBPTH) $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
141 $(mini_obj) \
142 miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
143- $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
144+
145+ mv -f miniperl miniperl-target
146+ ln -s hostperl miniperl
147+# $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
148 !NO!SUBS!
149 ;;
150 esac
151@@ -950,7 +959,7 @@ case "${osname}" in
152 catamount)
153 $spitshell >>$Makefile <<!GROK!THIS!
154 .PHONY: makeppport
155-makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
156+makeppport: \$(CONFIGPM)
157 -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
158 (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \
159 done
160@@ -960,7 +969,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM
161 *)
162 $spitshell >>$Makefile <<'!NO!SUBS!'
163 .PHONY: makeppport
164-makeppport: $(MINIPERL_EXE) $(CONFIGPM) $(nonxs_ext)
165+makeppport: $(CONFIGPM) $(nonxs_ext)
166 $(MINIPERL) $(Icwd) mkppport
167
168 !NO!SUBS!
169@@ -970,30 +979,30 @@ esac
170 $spitshell >>$Makefile <<'!NO!SUBS!'
171
172 .PHONY: preplibrary
173-preplibrary: $(MINIPERL_EXE) $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL)
174+preplibrary: $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL)
175
176 $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD)
177
178-$(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git.pl
179+$(CONFIGPOD): config.sh configpm Porting/Glossary lib/Config_git.pl
180 $(MINIPERL) configpm
181
182-lib/ExtUtils/Miniperl.pm: miniperlmain.c $(MINIPERL_EXE) minimod.pl $(CONFIGPM)
183+lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM)
184 $(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm
185
186 lib/re.pm: ext/re/re.pm
187 @-rm -f $@
188 cp ext/re/re.pm lib/re.pm
189
190-$(plextract): $(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext)
191+$(plextract): $(CONFIGPM) x2p/s2p $(dynamic_ext)
192 @-rm -f $@
193 $(MINIPERL) $@.PL
194
195-x2p/s2p: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
196+x2p/s2p: $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
197 cd x2p; $(LDLIBPTH) $(MAKE) s2p
198
199 unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data
200
201-uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
202+uni.data: $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
203 $(MINIPERL) $(Icwd) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
204 # Commented out so always runs, mktables looks at far more files than we
205 # can in this makefile to decide if needs to run or not
206@@ -1002,21 +1011,21 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li
207 # $(PERL_EXE) and ext because buildtoc uses Text::Wrap uses re
208 # But also this ensures that all extensions are built before we try to scan
209 # them, which picks up Devel::PPPort's documentation.
210-pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc
211- $(RUN_PERL) -f -Ilib pod/buildtoc --build-toc -q
212+pod/perltoc.pod: $(perltoc_pod_prereqs) $(ext) pod/buildtoc
213+ $(MINIPERL) -f -Ilib pod/buildtoc --build-toc -q
214
215 pod/perlapi.pod: pod/perlintern.pod
216
217-pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc
218+pod/perlintern.pod: autodoc.pl embed.fnc
219 $(MINIPERL) autodoc.pl
220
221-pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
222+pod/perlmodlib.pod: pod/perlmodlib.PL MANIFEST
223 $(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
224
225 pod/perldelta.pod: pod/perl5122delta.pod
226 $(LNS) perl5122delta.pod pod/perldelta.pod
227
228-extra.pods: $(MINIPERL_EXE)
229+extra.pods:
230 -@test ! -f extra.pods || rm -f `cat extra.pods`
231 -@rm -f extra.pods
232 -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
233@@ -1059,11 +1068,7 @@ no-install:
234 INSTALL_DEPENDENCE = all
235
236 install.perl: $(INSTALL_DEPENDENCE) installperl
237- $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
238- -@test ! -s extras.lst || $(MAKE) extras.install
239-
240-install.man: all installman
241- $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
242+ ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
243
244 # XXX Experimental. Hardwired values, but useful for testing.
245 # Eventually Configure could ask for some of these values.
246@@ -1160,16 +1165,16 @@ manicheck: FORCE
247 #
248 # DynaLoader may be needed for extensions that use Makefile.PL.
249
250-$(DYNALOADER): $(MINIPERL_EXE) preplibrary FORCE $(nonxs_ext)
251+$(DYNALOADER): preplibrary FORCE $(nonxs_ext)
252 $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
253
254-d_dummy $(dynamic_ext): $(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
255+d_dummy $(dynamic_ext): preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
256 $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
257
258-s_dummy $(static_ext): $(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE
259+s_dummy $(static_ext): preplibrary makeppport $(DYNALOADER) FORCE
260 $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
261
262-n_dummy $(nonxs_ext): $(MINIPERL_EXE) preplibrary FORCE
263+n_dummy $(nonxs_ext): preplibrary FORCE
264 $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
265 !NO!SUBS!
266
267@@ -1367,10 +1372,10 @@ _test:
268
269 test_prep_pre: preplibrary utilities $(nonxs_ext)
270
271-test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests
272+test_prep: test_prep_pre $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests
273 cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
274
275-test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
276+test_prep_reonly: $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
277 $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
278 cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
279
280@@ -1461,7 +1466,7 @@ minitest.prep:
281
282 # Can't depend on lib/Config.pm because that might be where miniperl
283 # is crashing.
284-minitest: $(MINIPERL_EXE) lib/re.pm minitest.prep
285+minitest: lib/re.pm minitest.prep
286 - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
287 && $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty
288