summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.8.8/Makefile.SH.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.8.8/Makefile.SH.patch')
-rw-r--r--meta/recipes-devtools/perl/perl-5.8.8/Makefile.SH.patch253
1 files changed, 253 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.8.8/Makefile.SH.patch b/meta/recipes-devtools/perl/perl-5.8.8/Makefile.SH.patch
new file mode 100644
index 0000000000..ab9c4b7d63
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.8.8/Makefile.SH.patch
@@ -0,0 +1,253 @@
1Index: perl-5.8.8/Makefile.SH
2===================================================================
3--- perl-5.8.8.orig/Makefile.SH 2006-01-24 23:49:44.000000000 +1100
4+++ perl-5.8.8/Makefile.SH 2007-06-14 13:29:37.000000000 +1000
5@@ -43,12 +43,12 @@
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_target='static_pic'
24@@ -108,7 +108,8 @@
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@@ -129,18 +130,7 @@
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@@ -401,9 +391,19 @@
55 .c.s:
56 $(CCCMDSRC) -S $*.c
57
58-all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.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_EXT) extra.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_EXT) $(unidatafiles)
66+
67+more: extra.pods $(private) $(public)
68+
69+more2: $(dynamic_ext)
70+
71+more3: $(nonxs_ext)
72+
73+more4: extras.make
74
75 .PHONY: all compile translators utilities
76
77@@ -413,10 +413,10 @@
78 cd x2p; $(MAKE) compile;
79 cd pod; $(MAKE) compile;
80
81-translators: miniperl$(EXE_EXT) $(CONFIGPM) FORCE
82+translators: $(CONFIGPM) FORCE
83 @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
84
85-utilities: miniperl$(EXE_EXT) $(CONFIGPM) $(plextract) lib/lib.pm FORCE
86+utilities: $(CONFIGPM) $(plextract) lib/lib.pm FORCE
87 @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all
88
89
90@@ -550,7 +550,7 @@
91 case "$useshrplib" in
92 true)
93 $spitshell >>Makefile <<'!NO!SUBS!'
94- $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs)
95+ $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs) -Wl,-soname,libperl.so.5
96 !NO!SUBS!
97 case "$osname" in
98 aix)
99@@ -591,7 +591,9 @@
100 $(CC) -o miniperl $(CLDFLAGS) \
101 `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
102 miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
103- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
104+ mv -f miniperl miniperl-target
105+ ln -s hostperl miniperl
106+# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
107 !NO!SUBS!
108 ;;
109 next4*)
110@@ -599,7 +601,9 @@
111 miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
112 $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
113 miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
114- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
115+ mv -f miniperl miniperl-target
116+ ln -s hostperl miniperl
117+# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
118 !NO!SUBS!
119 ;;
120 darwin*)
121@@ -620,7 +624,9 @@
122 -@rm -f miniperl.xok
123 $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \
124 miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
125- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
126+ mv -f miniperl miniperl-target
127+ ln -s hostperl miniperl
128+# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
129 !NO!SUBS!
130 ;;
131 *)
132@@ -629,7 +635,9 @@
133 -@rm -f miniperl.xok
134 $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \
135 miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
136- $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
137+ mv -f miniperl miniperl-target
138+ ln -s hostperl miniperl
139+# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
140 !NO!SUBS!
141 ;;
142 esac
143@@ -766,7 +774,7 @@
144 # We need to autosplit in two steps because VOS can't handle so many args
145 #
146 .PHONY: preplibrary
147-preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)
148+preplibrary: $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)
149 @sh ./makedir lib/auto
150 @echo " AutoSplitting perl library"
151 $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
152@@ -775,35 +783,35 @@
153 autosplit_lib_modules(@ARGV)' lib/*/*.pm
154 $(MAKE) lib/re.pm
155
156-lib/Config.pod: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
157+lib/Config.pod: config.sh configpm Porting/Glossary
158 $(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl lib/Config.pm
159
160 $(CONFIGPM): lib/Config.pod
161
162-lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM)
163+lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM)
164 $(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm
165
166 lib/re.pm: ext/re/re.pm
167 cp ext/re/re.pm lib/re.pm
168
169-$(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p
170+$(plextract): $(CONFIGPM) x2p/s2p
171 @-rm -f $@
172 $(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL
173
174-x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p.PL
175+x2p/s2p: $(CONFIGPM) x2p/s2p.PL
176 cd x2p; $(LDLIBPTH) $(MAKE) s2p
177
178-lib/lib.pm: miniperl$(EXE_EXT) $(CONFIGPM)
179+lib/lib.pm: $(CONFIGPM)
180 @-rm -f $@
181 $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL
182
183 unidatafiles $(unidatafiles): uni.data
184
185-uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables
186+uni.data: $(CONFIGPM) lib/unicore/mktables
187 cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w
188 touch uni.data
189
190-extra.pods: miniperl$(EXE_EXT)
191+extra.pods:
192 -@test -f extra.pods && rm -f `cat extra.pods`
193 -@rm -f extra.pods
194 -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
195@@ -850,18 +858,7 @@
196 INSTALL_DEPENDENCE = all
197
198 install.perl: $(INSTALL_DEPENDENCE) installperl
199- if [ -n "$(COMPILE)" ]; \
200- then \
201- cd utils; $(MAKE) compile; \
202- cd ../x2p; $(MAKE) compile; \
203- cd ../pod; $(MAKE) compile; \
204- else :; \
205- fi
206- $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
207- $(MAKE) extras.install
208-
209-install.man: all installman
210- $(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
211+ ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
212
213 # XXX Experimental. Hardwired values, but useful for testing.
214 # Eventually Configure could ask for some of these values.
215@@ -978,16 +975,16 @@
216 #
217 # DynaLoader may be needed for extensions that use Makefile.PL.
218
219-$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE
220+$(DYNALOADER): preplibrary FORCE
221 @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
222
223-d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
224+d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE
225 @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
226
227-s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
228+s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE
229 @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
230
231-n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
232+n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE
233 @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
234
235 .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
236@@ -1125,7 +1122,7 @@
237
238 test_prep_pre: preplibrary utilities $(nonxs_ext)
239
240-test_prep: test_prep_pre miniperl$(EXE_EXT) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
241+test_prep: test_prep_pre $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
242 PERL=./perl $(MAKE) _test_prep
243
244 _test_tty:
245@@ -1238,7 +1235,7 @@
246
247 # Can't depend on lib/Config.pm because that might be where miniperl
248 # is crashing.
249-minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep
250+minitest: lib/re.pm minitest.prep
251 - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
252 && $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty
253