summaryrefslogtreecommitdiff
path: root/packages/perl/files/Makefile.SH.patch
blob: 35a4e6dfde58789dea99c4d1fd87a80d2a557e50 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
*** ./Makefile.SH	Wed Aug  4 12:16:15 2004
--- ./Makefile.SH.patch	Wed Aug  4 14:03:42 2004
***************
*** 110,127 ****
  	    # INSTALL file, under "Building a shared perl library".
  	    # If there is no pre-existing $libperl, we don't need
  	    # to do anything further.
! 	    if test -f $archlib/CORE/$libperl; then
! 		rm -f preload
! 		cat <<'EOT' > preload
! #! /bin/sh
! lib=$1
! shift
! test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
! exec "$@"
! EOT
! 		chmod 755 preload
! 		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
! 	    fi
  	    ;;
  	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
  		;;
--- 110,116 ----
  	    # INSTALL file, under "Building a shared perl library".
  	    # If there is no pre-existing $libperl, we don't need
  	    # to do anything further.
! 	    echo linux libraries overwritten by cross-compile patches
  	    ;;
  	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
  		;;
***************
*** 349,357 ****
  .c.s:
  	$(CCCMDSRC) -S $*.c
  
! all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
! 	@echo " ";
! 	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
  
  .PHONY: all compile translators utilities
  
--- 338,358 ----
  .c.s:
  	$(CCCMDSRC) -S $*.c
  
! #all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
! #	@echo " ";
! #	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."
! 
! all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT)
! 	mv miniperl miniperl-cross
! 	ln -s hostperl  miniperl
! 
! more: extra.pods $(private) $(public)
! 
! more2: $(dynamic_ext)
! 
! more3: $(nonxs_ext)
! 
! more4: extras.make
  
  .PHONY: all compile translators utilities
  
***************
*** 361,370 ****
  	cd x2p; $(MAKE) compile;
  	cd pod; $(MAKE) compile;
  
! translators:	miniperl$(EXE_EXT) lib/Config.pm FORCE
  	@echo " "; echo "	Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
  
! utilities:	miniperl$(EXE_EXT) lib/Config.pm $(plextract) lib/lib.pm FORCE
  	@echo " "; echo "	Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all
  
  
--- 362,371 ----
  	cd x2p; $(MAKE) compile;
  	cd pod; $(MAKE) compile;
  
! translators:	lib/Config.pm FORCE
  	@echo " "; echo "	Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
  
! utilities:	lib/Config.pm $(plextract) lib/lib.pm FORCE
  	@echo " "; echo "	Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all
  
  
***************
*** 541,547 ****
  	$(CC) -o miniperl $(CLDFLAGS) \
  	    `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
  	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
! 	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
  !NO!SUBS!
  		;;
  	beos*|next4*)
--- 542,548 ----
  	$(CC) -o miniperl $(CLDFLAGS) \
  	    `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
  	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
! #	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
  !NO!SUBS!
  		;;
  	beos*|next4*)
***************
*** 549,555 ****
  miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
  	$(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
  	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
! 	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
  !NO!SUBS!
  		;;
  	darwin*)
--- 550,556 ----
  miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
  	$(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
  	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
! #	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
  !NO!SUBS!
  		;;
  	darwin*)
***************
*** 716,722 ****
  # We need to autosplit in two steps because VOS can't handle so many args
  #
  .PHONY: preplibrary
! preplibrary: miniperl$(EXE_EXT) lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL)
  	@sh ./makedir lib/auto
  	@echo "	AutoSplitting perl library"
  	$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
--- 717,723 ----
  # We need to autosplit in two steps because VOS can't handle so many args
  #
  .PHONY: preplibrary
! preplibrary: lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL)
  	@sh ./makedir lib/auto
  	@echo "	AutoSplitting perl library"
  	$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
***************
*** 728,738 ****
  # Take care to avoid modifying lib/Config.pm without reason
  # (If trying to create a new port and having problems with the configpm script,
  # try 'make minitest' and/or commenting out the tests at the end of configpm.)
! lib/Config.pm: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary
  	$(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp
  	sh mv-if-diff configpm.tmp $@
  
! lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl lib/Config.pm
  	$(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp
  	sh mv-if-diff minimod.tmp $@
  	-touch lib/ExtUtils/Miniperl.pm
--- 729,739 ----
  # Take care to avoid modifying lib/Config.pm without reason
  # (If trying to create a new port and having problems with the configpm script,
  # try 'make minitest' and/or commenting out the tests at the end of configpm.)
! lib/Config.pm: config.sh configpm Porting/Glossary
  	$(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp
  	sh mv-if-diff configpm.tmp $@
  
! lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl lib/Config.pm
  	$(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp
  	sh mv-if-diff minimod.tmp $@
  	-touch lib/ExtUtils/Miniperl.pm
***************
*** 740,757 ****
  lib/re.pm: ext/re/re.pm
  	cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm
  
! $(plextract):	miniperl$(EXE_EXT) lib/Config.pm x2p/s2p
  	@-rm -f $@
  	$(LDLIBPTH) ./miniperl -Ilib $@.PL
  
! x2p/s2p: miniperl$(EXE_EXT) lib/Config.pm x2p/s2p.PL
  	cd x2p; $(LDLIBPTH) $(MAKE) s2p
  
! lib/lib.pm:	miniperl$(EXE_EXT) lib/Config.pm
  	@-rm -f $@
  	$(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL
  
! extra.pods: miniperl$(EXE_EXT)
  	-@test -f extra.pods && rm -f `cat extra.pods`
  	-@rm -f extra.pods
  	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
--- 741,758 ----
  lib/re.pm: ext/re/re.pm
  	cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm
  
! $(plextract):	lib/Config.pm x2p/s2p
  	@-rm -f $@
  	$(LDLIBPTH) ./miniperl -Ilib $@.PL
  
! x2p/s2p: lib/Config.pm x2p/s2p.PL
  	cd x2p; $(LDLIBPTH) $(MAKE) s2p
  
! lib/lib.pm:	lib/Config.pm
  	@-rm -f $@
  	$(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL
  
! extra.pods: 
  	-@test -f extra.pods && rm -f `cat extra.pods`
  	-@rm -f extra.pods
  	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
***************
*** 798,815 ****
  INSTALL_DEPENDENCE = all
  
  install.perl:	$(INSTALL_DEPENDENCE) installperl
! 	if [ -n "$(COMPILE)" ]; \
! 	then \
! 		cd utils; $(MAKE) compile; \
! 		cd ../x2p; $(MAKE) compile; \
! 		cd ../pod; $(MAKE) compile; \
! 	else :; \
! 	fi
! 	$(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
! 	$(MAKE) extras.install
! 
! install.man:	all installman
! 	$(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
  
  # XXX Experimental. Hardwired values, but useful for testing.
  # Eventually Configure could ask for some of these values.
--- 799,805 ----
  INSTALL_DEPENDENCE = all
  
  install.perl:	$(INSTALL_DEPENDENCE) installperl
! 	hostperl -Ifake_config_library -MConfig installperl $(INSTALLFLAGS) $(STRIPFLAGS)
  
  # XXX Experimental. Hardwired values, but useful for testing.
  # Eventually Configure could ask for some of these values.
***************
*** 925,940 ****
  #
  # DynaLoader may be needed for extensions that use Makefile.PL.
  
! $(DYNALOADER):	miniperl$(EXE_EXT) preplibrary FORCE
  	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
! d_dummy $(dynamic_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
  	@$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
! s_dummy $(static_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
  	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
! n_dummy $(nonxs_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
  	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
  .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
--- 915,930 ----
  #
  # DynaLoader may be needed for extensions that use Makefile.PL.
  
! $(DYNALOADER):	preplibrary FORCE
  	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
! d_dummy $(dynamic_ext):	preplibrary $(DYNALOADER) FORCE
  	@$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
! s_dummy $(static_ext):	preplibrary $(DYNALOADER) FORCE
  	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
! n_dummy $(nonxs_ext):	preplibrary $(DYNALOADER) FORCE
  	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
  .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
***************
*** 1074,1080 ****
  
  test_prep_pre: preplibrary utilities $(nonxs_ext)
  
! test_prep: test_prep_pre miniperl$(EXE_EXT) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
  	PERL=./perl $(MAKE) _test_prep
  
  _test_tty:
--- 1064,1070 ----
  
  test_prep_pre: preplibrary utilities $(nonxs_ext)
  
! test_prep: test_prep_pre perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
  	PERL=./perl $(MAKE) _test_prep
  
  _test_tty:
***************
*** 1167,1173 ****
  
  # Can't depend on lib/Config.pm because that might be where miniperl
  # is crashing.
! minitest: miniperl$(EXE_EXT) lib/re.pm
  	-@test -f lib/lib.pm && test -f lib/Config.pm || \
  	  $(MAKE) lib/Config.pm lib/lib.pm
  	@echo " "
--- 1157,1163 ----
  
  # Can't depend on lib/Config.pm because that might be where miniperl
  # is crashing.
! minitest: lib/re.pm
  	-@test -f lib/lib.pm && test -f lib/Config.pm || \
  	  $(MAKE) lib/Config.pm lib/lib.pm
  	@echo " "