Commit | Line | Data |
---|---|---|
efbf22ba RGS |
1 | --- ../Makefile.SH |
2 | +++ ../Makefile.SH | |
3 | @@ -129,18 +129,7 @@ | |
136febd5 JH |
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 | |
e42fa77b | 8 | - rm -f preload |
136febd5 JH |
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 | |
e42fa77b JH |
16 | - chmod 755 preload |
17 | - ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" | |
136febd5 JH |
18 | - fi |
19 | + echo linux libraries overwritten by cross-compile patches | |
20 | ;; | |
e42fa77b JH |
21 | os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" |
22 | ;; | |
efbf22ba | 23 | @@ -389,9 +378,21 @@ |
6a809565 JH |
24 | .c.s: |
25 | $(CCCMDSRC) -S $*.c | |
26 | ||
efbf22ba | 27 | -all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make |
6a809565 JH |
28 | - @echo " "; |
29 | - @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | |
efbf22ba | 30 | +#all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make |
6a809565 JH |
31 | +# @echo " "; |
32 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | |
136febd5 | 33 | + |
6a809565 JH |
34 | +all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) |
35 | + mv miniperl miniperl-arm | |
36 | + ln -s /usr/bin/perl miniperl | |
37 | + | |
38 | +more: extra.pods $(private) $(public) | |
39 | + | |
40 | +more2: $(dynamic_ext) | |
41 | + | |
42 | +more3: $(nonxs_ext) | |
43 | + | |
136febd5 | 44 | +more4: extras.make |
6a809565 JH |
45 | |
46 | .PHONY: all compile translators utilities | |
47 | ||
efbf22ba | 48 | @@ -401,10 +402,10 @@ |
6a809565 JH |
49 | cd x2p; $(MAKE) compile; |
50 | cd pod; $(MAKE) compile; | |
51 | ||
efbf22ba RGS |
52 | -translators: miniperl$(EXE_EXT) $(CONFIGPM) FORCE |
53 | +translators: $(CONFIGPM) FORCE | |
6a809565 JH |
54 | @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all |
55 | ||
efbf22ba RGS |
56 | -utilities: miniperl$(EXE_EXT) $(CONFIGPM) $(plextract) lib/lib.pm FORCE |
57 | +utilities: $(CONFIGPM) $(plextract) lib/lib.pm FORCE | |
6a809565 JH |
58 | @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all |
59 | ||
60 | ||
efbf22ba | 61 | @@ -579,7 +580,7 @@ |
6a809565 JH |
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 | ;; | |
efbf22ba RGS |
69 | next4*) |
70 | @@ -587,7 +588,7 @@ | |
136febd5 JH |
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) | |
6a809565 JH |
74 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest |
75 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | |
76 | !NO!SUBS! | |
77 | ;; | |
136febd5 | 78 | darwin*) |
efbf22ba | 79 | @@ -754,7 +755,7 @@ |
6a809565 JH |
80 | # We need to autosplit in two steps because VOS can't handle so many args |
81 | # | |
82 | .PHONY: preplibrary | |
efbf22ba RGS |
83 | -preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) |
84 | +preplibrary: $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) | |
6a809565 JH |
85 | @sh ./makedir lib/auto |
86 | @echo " AutoSplitting perl library" | |
87 | $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ | |
efbf22ba RGS |
88 | @@ -763,35 +764,35 @@ |
89 | autosplit_lib_modules(@ARGV)' lib/*/*.pm | |
90 | $(MAKE) lib/re.pm | |
91 | ||
92 | -lib/Config.pod: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary | |
93 | +lib/Config.pod: config.sh configpm Porting/Glossary | |
94 | $(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl lib/Config.pm | |
95 | ||
96 | $(CONFIGPM): lib/Config.pod | |
97 | ||
98 | -lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM) | |
99 | +lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM) | |
100 | $(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm | |
101 | ||
6a809565 | 102 | lib/re.pm: ext/re/re.pm |
efbf22ba | 103 | cp ext/re/re.pm lib/re.pm |
6a809565 | 104 | |
efbf22ba RGS |
105 | -$(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p |
106 | +$(plextract): $(CONFIGPM) x2p/s2p | |
6a809565 | 107 | @-rm -f $@ |
efbf22ba | 108 | $(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL |
6a809565 | 109 | |
efbf22ba RGS |
110 | -x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p.PL |
111 | +x2p/s2p: $(CONFIGPM) x2p/s2p.PL | |
6a809565 JH |
112 | cd x2p; $(LDLIBPTH) $(MAKE) s2p |
113 | ||
efbf22ba RGS |
114 | -lib/lib.pm: miniperl$(EXE_EXT) $(CONFIGPM) |
115 | +lib/lib.pm: $(CONFIGPM) | |
6a809565 JH |
116 | @-rm -f $@ |
117 | $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL | |
118 | ||
efbf22ba RGS |
119 | unidatafiles $(unidatafiles): uni.data |
120 | ||
121 | -uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables | |
122 | +uni.data: $(CONFIGPM) lib/unicore/mktables | |
123 | cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w | |
124 | touch uni.data | |
125 | ||
6a809565 | 126 | -extra.pods: miniperl$(EXE_EXT) |
efbf22ba | 127 | +extra.pods: |
6a809565 JH |
128 | -@test -f extra.pods && rm -f `cat extra.pods` |
129 | -@rm -f extra.pods | |
130 | -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ | |
efbf22ba | 131 | @@ -837,18 +838,7 @@ |
e4568ebb | 132 | INSTALL_DEPENDENCE = all |
efbf22ba | 133 | |
e4568ebb | 134 | install.perl: $(INSTALL_DEPENDENCE) installperl |
6a809565 JH |
135 | - if [ -n "$(COMPILE)" ]; \ |
136 | - then \ | |
137 | - cd utils; $(MAKE) compile; \ | |
138 | - cd ../x2p; $(MAKE) compile; \ | |
139 | - cd ../pod; $(MAKE) compile; \ | |
140 | - else :; \ | |
141 | - fi | |
136febd5 | 142 | - $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
6a809565 | 143 | - $(MAKE) extras.install |
136febd5 | 144 | - |
6a809565 | 145 | -install.man: all installman |
136febd5 JH |
146 | - $(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS) |
147 | + /usr/bin/perl -Ifake_config_library -MConfig installperl $(INSTALLFLAGS) $(STRIPFLAGS) | |
6a809565 JH |
148 | |
149 | # XXX Experimental. Hardwired values, but useful for testing. | |
150 | # Eventually Configure could ask for some of these values. | |
efbf22ba | 151 | @@ -950,16 +940,16 @@ |
6a809565 JH |
152 | # |
153 | # DynaLoader may be needed for extensions that use Makefile.PL. | |
154 | ||
155 | -$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE | |
156 | +$(DYNALOADER): preplibrary FORCE | |
157 | @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | |
158 | ||
159 | -d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | |
160 | +d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE | |
161 | @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | |
162 | ||
163 | -s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | |
164 | +s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE | |
165 | @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | |
166 | ||
167 | -n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | |
136febd5 | 168 | +n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE |
6a809565 JH |
169 | @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) |
170 | ||
171 | .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ | |
efbf22ba | 172 | @@ -1101,7 +1091,7 @@ |
6a809565 JH |
173 | |
174 | test_prep_pre: preplibrary utilities $(nonxs_ext) | |
175 | ||
efbf22ba RGS |
176 | -test_prep: test_prep_pre miniperl$(EXE_EXT) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) |
177 | +test_prep: test_prep_pre $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) | |
6a809565 JH |
178 | PERL=./perl $(MAKE) _test_prep |
179 | ||
180 | _test_tty: | |
efbf22ba | 181 | @@ -1214,7 +1204,7 @@ |
6a809565 JH |
182 | |
183 | # Can't depend on lib/Config.pm because that might be where miniperl | |
184 | # is crashing. | |
efbf22ba RGS |
185 | -minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep |
186 | +minitest: lib/re.pm minitest.prep | |
187 | - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ | |
115e9681 | 188 | && $(LDLIBPTH) ./perl TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty |
efbf22ba | 189 |