summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch')
-rw-r--r--meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch356
1 files changed, 356 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch b/meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch
new file mode 100644
index 0000000000..689d394931
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.20.0/Makefile.SH.patch
@@ -0,0 +1,356 @@
1Upstream-Status:Inappropriate [embedded specific]
2
3Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
4---
5 Makefile.SH | 130 ++++++++++++++++++++++++++++++------------------------------
6 1 file changed, 66 insertions(+), 64 deletions(-)
7
8diff --git a/Makefile.SH b/Makefile.SH
9--- a/Makefile.SH
10+++ b/Makefile.SH
11@@ -39,10 +39,10 @@ case "$useshrplib" in
12 true)
13 # Prefix all runs of 'miniperl' and 'perl' with
14 # $ldlibpth so that ./perl finds *this* shared libperl.
15- case "$LD_LIBRARY_PATH" in
16- '') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;;
17- *) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;;
18- esac
19+ #case "$LD_LIBRARY_PATH" in
20+ #'') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;;
21+ #*) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;;
22+ #esac
23
24 pldlflags="$cccdlflags"
25 static_ldflags=''
26@@ -122,10 +122,11 @@ true)
27 *)
28 eval "ldlibpthval=\"\$$ldlibpthname\""
29
30- case "$ldlibpthval" in
31- '') ldlibpth="$ldlibpthname=` quote "$pwd" `" ;;
32- *) ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;;
33- esac
34+# We compile in the library path in OE from cross-compile, so lets not do this
35+# case "$ldlibpthval" in
36+# '') ldlibpth="$ldlibpthname=` quote "$pwd" `" ;;
37+# *) ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;;
38+# esac
39
40 ;;
41 esac
42@@ -141,18 +142,7 @@ true)
43 # INSTALL file, under "Building a shared perl library".
44 # If there is no pre-existing $libperl, we don't need
45 # to do anything further.
46- if test -f $archlib/CORE/$libperl; then
47- rm -f preload
48- cat <<'EOT' > preload
49-#! /bin/sh
50-lib=$1
51-shift
52-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
53-exec "$@"
54-EOT
55- chmod 755 preload
56- ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
57- fi
58+ echo linux libraries overwritten by cross-compile patches
59 ;;
60 os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
61 ;;
62@@ -565,9 +555,19 @@ splintfiles = $(c1)
63 @echo `$(CCCMDSRC)` -S $*.c
64 @`$(CCCMDSRC)` -S $*.c
65
66-all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
67- @echo " ";
68- @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
69+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
70+# @echo " ";
71+# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
72+
73+all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(unidatafiles)
74+
75+more: $(generated_pods) $(private) $(public)
76+
77+more2: $(dynamic_ext)
78+
79+more3: $(nonxs_ext)
80+
81+more4: extras.make
82
83 .PHONY: all translators utilities
84
85@@ -575,7 +575,7 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafile
86 # by make_patchnum.pl.
87 git_version.h: lib/Config_git.pl
88
89-lib/Config_git.pl: $(MINIPERL_EXE) make_patchnum.pl
90+lib/Config_git.pl: make_patchnum.pl
91 $(MINIPERL) make_patchnum.pl
92
93 # make sure that we recompile perl.c if the git version changes
94@@ -588,8 +588,8 @@ perl$(OBJ_EXT): git_version.h
95 # loading, we need to build perl first.
96 case "$usedl$static_cwd" in
97 defineundef)
98- util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
99- x2p_deps="\$(MINIPERL_EXE) \$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE"
100+ util_deps='$(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
101+ x2p_deps="\$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE"
102 ;;
103 definedefine)
104 util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
105@@ -613,7 +613,7 @@ x2p/s2p: $x2p_deps
106 x2p/find2perl: $x2p_deps
107 cd x2p; \$(LDLIBPTH) \$(MAKE) find2perl
108
109-utils/Makefile: \$(MINIPERL_EXE) \$(CONFIGPM) utils/Makefile.PL
110+utils/Makefile: \$(CONFIGPM) utils/Makefile.PL
111 \$(MINIPERL) -Ilib utils/Makefile.PL
112
113 utilities: utils/Makefile $util_deps
114@@ -708,7 +708,7 @@ esac
115
116
117 $spitshell >>$Makefile <<'!NO!SUBS!'
118-perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib
119+perlmain.c: ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
120 $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext)
121
122 # The file ext.libs is a list of libraries that must be linked in
123@@ -769,7 +769,7 @@ PERLEXPORT = perl.exp
124 ;;
125 esac
126 $spitshell >>$Makefile <<'!NO!SUBS!'
127-perl.exp: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH)
128+perl.exp: makedef.pl $(CONFIGPM) $(SYM) $(SYMH)
129 ./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp
130
131 !NO!SUBS!
132@@ -778,7 +778,7 @@ os2)
133 $spitshell >>$Makefile <<'!NO!SUBS!'
134 MINIPERLEXP = miniperl
135
136-perl5.def: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map
137+perl5.def: makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map
138 ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
139
140 !NO!SUBS!
141@@ -838,7 +838,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT)
142 true)
143 $spitshell >>$Makefile <<'!NO!SUBS!'
144 rm -f $@
145- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs)
146+ $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5
147 !NO!SUBS!
148 case "$osname" in
149 aix)
150@@ -886,7 +886,9 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
151 $spitshell >>$Makefile <<'!NO!SUBS!'
152 lib/buildcustomize.pl: $& $(mini_obj)
153 $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs)
154- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
155+ mv -f miniperl miniperl-target
156+ ln -s hostperl miniperl
157+ #$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
158 $(MINIPERL) -f write_buildcustomize.pl
159 !NO!SUBS!
160 ;;
161@@ -894,7 +896,9 @@ lib/buildcustomize.pl: $& $(mini_obj)
162 $spitshell >>$Makefile <<'!NO!SUBS!'
163 lib/buildcustomize.pl: $& $(mini_obj) write ldcustomize.pl
164 $(CC) -o $(MINIPERL_EXE) $(mini_obj libs)
165- $(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
166+ mv -f miniperl miniperl-target
167+ ln -s hostperl miniperl
168+ #$(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
169 $(MINIPERL) -f write_buildcustomize.pl
170 !NO!SUBS!
171 ;;
172@@ -916,7 +920,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
173 -@rm -f miniperl.xok
174 $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
175 $(mini_obj) $(libs)
176- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
177+ mv -f miniperl miniperl-target
178+ ln -s hostperl miniperl
179+ #$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
180 $(MINIPERL) -f write_buildcustomize.pl
181 !NO!SUBS!
182 ;;
183@@ -927,7 +933,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj) write_buildcustomize.pl
184 -@rm -f miniperl.xok
185 -@rm \$(MINIPERL_EXE)
186 \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
187- \$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
188+ mv -f miniperl miniperl-target
189+ ln -s hostperl miniperl
190+ #\$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
191 \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
192 !GROK!THIS!
193 else
194@@ -936,7 +944,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
195 -@rm -f miniperl.xok
196 $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
197 $(mini_obj) $(libs)
198- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
199+ mv -f miniperl miniperl-target
200+ ln -s hostperl miniperl
201+ #$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
202 $(MINIPERL) -f write_buildcustomize.pl
203 !NO!SUBS!
204 fi
205@@ -967,7 +977,7 @@ case "${osname}" in
206 catamount)
207 $spitshell >>$Makefile <<!GROK!THIS!
208 .PHONY: makeppport
209-makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
210+makeppport: \$(CONFIGPM)
211 -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
212 (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \
213 done
214@@ -977,7 +987,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
215 *)
216 $spitshell >>$Makefile <<'!NO!SUBS!'
217 .PHONY: makeppport
218-makeppport: $(MINIPERL_EXE) $(CONFIGPM) $(nonxs_ext)
219+makeppport: $(CONFIGPM) $(nonxs_ext)
220 $(MINIPERL) mkppport
221
222 !NO!SUBS!
223@@ -987,16 +997,16 @@ esac
224 $spitshell >>$Makefile <<'!NO!SUBS!'
225
226 .PHONY: preplibrary
227-preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL)
228+preplibrary: $(CONFIGPM) $(PREPLIBRARY_LIBPERL)
229
230 $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD)
231
232-$(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git.pl
233+$(CONFIGPOD): config.sh configpm Porting/Glossary lib/Config_git.pl
234 $(MINIPERL) configpm
235
236 unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data
237
238-uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
239+uni.data: $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
240 $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
241 # Commented out so always runs, mktables looks at far more files than we
242 # can in this makefile to decide if needs to run or not
243@@ -1005,22 +1015,22 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
244 # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5
245 # But also this ensures that all extensions are built before we try to scan
246 # them, which picks up Devel::PPPort's documentation.
247-pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc
248- $(RUN_PERL) -f pod/buildtoc -q
249+pod/perltoc.pod: $(perltoc_pod_prereqs) $(ext) pod/buildtoc
250+ $(MINIPERL) -f pod/buildtoc -q
251
252 pod/perlapi.pod: pod/perlintern.pod
253
254-pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc
255+pod/perlintern.pod: autodoc.pl embed.fnc
256 $(MINIPERL) autodoc.pl
257
258-pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
259+pod/perlmodlib.pod: pod/perlmodlib.PL MANIFEST
260 $(MINIPERL) pod/perlmodlib.PL -q
261
262 pod/perl5200delta.pod: pod/perldelta.pod
263 $(RMS) pod/perl5200delta.pod
264 $(LNS) perldelta.pod pod/perl5200delta.pod
265
266-extra.pods: $(MINIPERL_EXE)
267+extra.pods:
268 -@test ! -f extra.pods || rm -f `cat extra.pods`
269 -@rm -f extra.pods
270 -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
271@@ -1075,11 +1085,7 @@ done
272 if test "X$hostperl" != X; then
273 $spitshell >>$Makefile <<'!NO!SUBS!'
274 install.perl: $(INSTALL_DEPENDENCE) installperl
275- $(HOST_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
276- -@test ! -s extras.lst || $(MAKE) extras.install
277-
278-install.man: all installman
279- $(HOST_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
280+ ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
281
282 # XXX Experimental. Hardwired values, but useful for testing.
283 # Eventually Configure could ask for some of these values.
284@@ -1097,11 +1103,7 @@ install.html: all installhtml
285 else
286 $spitshell >>$Makefile <<'!NO!SUBS!'
287 install.perl: $(INSTALL_DEPENDENCE) installperl
288- $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
289- -@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst`
290-
291-install.man: all installman
292- $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
293+ ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
294
295 # XXX Experimental. Hardwired values, but useful for testing.
296 # Eventually Configure could ask for some of these values.
297@@ -1206,16 +1208,16 @@ manicheck: FORCE
298 #
299 # DynaLoader may be needed for extensions that use Makefile.PL.
300
301-$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
302+$(DYNALOADER): lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
303 $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
304
305-d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL)
306+d_dummy $(dynamic_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL)
307 $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
308
309-s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
310+s_dummy $(static_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
311 $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
312
313-n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
314+n_dummy $(nonxs_ext): lib/buildcustomize.pl preplibrary FORCE
315 $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
316 !NO!SUBS!
317
318@@ -1409,7 +1411,7 @@ test_prep_pre: preplibrary utilities $(nonxs_ext)
319
320 case "$targethost" in
321 '') $spitshell >>$Makefile <<'!NO!SUBS!'
322-test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
323+test_prep test-prep: test_prep_pre $(unidatafiles) $(PERL_EXE) \
324 $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \
325 $(generated_pods)
326 cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
327@@ -1417,7 +1419,7 @@ test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
328 !NO!SUBS!
329 ;;
330 *) $spitshell >>$Makefile <<!GROK!THIS!
331-test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE) \
332+test_prep test-prep: test_prep_pre \$(unidatafiles) \$(PERL_EXE) \
333 \$(dynamic_ext) \$(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \
334 \$(generated_pods)
335 $to libperl.*
336@@ -1469,7 +1471,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE
337 esac
338
339 $spitshell >>$Makefile <<'!NO!SUBS!'
340-test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
341+test_prep_reonly: $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
342 $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
343 cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
344 !NO!SUBS!
345@@ -1520,7 +1522,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!'
346
347 # Can't depend on lib/Config.pm because that might be where miniperl
348 # is crashing.
349-minitest: $(MINIPERL_EXE)
350+minitest:
351 -@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles)
352 @echo " "
353 @echo "You may see some irrelevant test failures if you have been unable"
354--
3551.8.1.2
356
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 02:34:12 +0000