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