aboutsummaryrefslogtreecommitdiff
path: root/lang/perl/patches/900-use-rm-force.patch
blob: 09967bebd6cc64b83bc706c71bb4106962cbef63 (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
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -289,6 +289,7 @@ LNS = $lns
 # NOTE: some systems don't grok "cp -f". XXX Configure test needed?
 CPS = $cp
 RMS = rm -f
+RMS_R = rm -rf
 ranlib = $ranlib
 ECHO = $echo
 
@@ -786,7 +787,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
 	./generate_uudmap$(HOST_EXE_EXT) $(generated_headers)
 
 generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
-	-@rm generate_uudmap$(HOST_EXE_EXT)
+	@$(RMS) generate_uudmap$(HOST_EXE_EXT)
 	$(LNS) $(HOST_GENERATE) generate_uudmap$(HOST_EXE_EXT)
 
 !NO!SUBS!
@@ -891,26 +892,26 @@ mydtrace.h: $(DTRACE_H)
 	define)
 		$spitshell >>$Makefile <<'!NO!SUBS!'
 $(DTRACE_MINI_O): perldtrace.d $(miniperl_objs_nodt)
-	-rm -rf mpdtrace
+	$(RMS_R) mpdtrace
 	mkdir mpdtrace
 	cp $(miniperl_objs_nodt) mpdtrace/
 	$(DTRACE) -G -s perldtrace.d -o $(DTRACE_MINI_O) $(miniperl_dtrace_objs)
 
 $(DTRACE_PERLLIB_O): perldtrace.d $(perllib_objs_nodt)
-	-rm -rf libpdtrace
+	$(RMS_R) libpdtrace
 	mkdir libpdtrace
 	cp $(perllib_objs_nodt) libpdtrace/
 	$(DTRACE) -G -s perldtrace.d -o $(DTRACE_PERLLIB_O) $(perllib_dtrace_objs)
 
 $(DTRACE_MAIN_O): perldtrace.d perlmain$(OBJ_EXT)
-	-rm -rf maindtrace
+	$(RMS_R) maindtrace
 	mkdir maindtrace
 	cp perlmain$(OBJ_EXT) maindtrace/
 	$(DTRACE) -G -s perldtrace.d -o $(DTRACE_MAIN_O) $(perlmain_dtrace_objs) ||	      \
 	  ( $(ECHO) "No probes in perlmain$(OBJ_EXT), generating a dummy $(DTRACE_MAIN_O)" && \
 	    $(ECHO) >dtrace_main.c &&							      \
 	    `$(CCCMD)` $(PLDLFLAGS) dtrace_main.c &&					      \
-	     rm -f dtrace_main.c )
+	     $(RMS) dtrace_main.c )
 
 !NO!SUBS!
 		;;
@@ -921,13 +922,13 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
 	case "$useshrplib" in
 	true)
 		$spitshell >>$Makefile <<'!NO!SUBS!'
-	rm -f $@
+	$(RMS) $@
 	$(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs)
 !NO!SUBS!
 		case "$osname" in
 		aix)
 			$spitshell >>$Makefile <<'!NO!SUBS!'
-	rm -f libperl$(OBJ_EXT)
+	$(RMS) libperl$(OBJ_EXT)
 	mv $@ libperl$(OBJ_EXT)
 	$(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
 !NO!SUBS!
@@ -936,7 +937,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
 		;;
 	*)
 		$spitshell >>$Makefile <<'!NO!SUBS!'
-	rm -f $(LIBPERL)
+	$(RMS) $(LIBPERL)
 	$(AR) rc $(LIBPERL) $(perllib_objs) $(DYNALOADER)
 	@$(ranlib) $(LIBPERL)
 !NO!SUBS!
@@ -970,7 +971,7 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
 	amigaos*)
 		$spitshell >>$Makefile <<'!NO!SUBS!'
 lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
-	-@rm -f miniperl.xok
+	@$(RMS) miniperl.xok
 	$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
 	    $(miniperl_objs) $(libs)
 #	$(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'
@@ -992,7 +993,7 @@ NAMESPACEFLAGS = -force_flat_namespace
 		esac
 		$spitshell >>$Makefile <<'!NO!SUBS!'
 lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
-	-@rm -f miniperl.xok
+	@$(RMS) miniperl.xok
 	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
 	    $(miniperl_objs) $(libs)
 	$(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'
@@ -1003,8 +1004,8 @@ lib/buildcustomize.pl: $& $(miniperl_obj
 		if test "X$hostperl" != X; then
 			$spitshell >>$Makefile <<!GROK!THIS!
 lib/buildcustomize.pl: \$& \$(miniperl_dep) write_buildcustomize.pl
-	-@rm -f miniperl.xok
-	-@rm \$(MINIPERL_EXE)
+	@\$(RMS) miniperl.xok
+	@\$(RMS) \$(MINIPERL_EXE)
 	\$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
 	\$(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'
 	\$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
@@ -1012,7 +1013,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_d
 		else
 			$spitshell >>$Makefile <<'!NO!SUBS!'
 lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl
-	-@rm -f miniperl.xok
+	@$(RMS) miniperl.xok
 	$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
 	    $(miniperl_objs) $(libs)
 	$(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'
@@ -1025,7 +1026,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep
 	$spitshell >>$Makefile <<'!NO!SUBS!'
 
 $(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl
-	-@rm -f miniperl.xok
+	@$(RMS) miniperl.xok
 !NO!SUBS!
 
         case "$osname" in
@@ -1133,8 +1134,8 @@ pod/perl5382delta.pod: pod/perldelta.pod
 	$(LNS) perldelta.pod pod/perl5382delta.pod
 
 extra.pods: $(MINIPERL_EXE)
-	-@test ! -f extra.pods || rm -f `cat extra.pods`
-	-@rm -f extra.pods
+	-@test ! -f extra.pods || $(RMS) `cat extra.pods`
+	@$(RMS) extra.pods
 	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
 	    nx=`echo $$x | sed -e "s/README\.//"`; \
 	    $(LNS) ../$$x "pod/perl"$$nx".pod" ; \
@@ -1334,11 +1335,11 @@ realclean:	_realcleaner _mopup
 	@echo "Note that '$(MAKE) realclean' does not delete config.sh or Policy.sh"
 
 _clobber:
-	-@rm -f Cross/run-* Cross/to-* Cross/from-* Cross/mkdir
-	-rm -rf host
-	rm -f t/test_state
-	rm -f config.sh cppstdin Policy.sh extras.lst
-	rm -f $(MANIFEST_SRT)
+	@$(RMS) Cross/run-* Cross/to-* Cross/from-* Cross/mkdir
+	$(RMS_R) host
+	$(RMS) t/test_state
+	$(RMS) config.sh cppstdin Policy.sh extras.lst
+	$(RMS) $(MANIFEST_SRT)
 
 clobber:	_realcleaner _mopup _clobber
 
@@ -1346,24 +1347,24 @@ distclean:	clobber
 
 # Like distclean but also removes emacs backups and *.orig.
 veryclean:	_verycleaner _mopup _clobber
-	-@rm -f Obsolete Wanted
+	@$(RMS) Obsolete Wanted
 
 # Do not 'make _mopup' directly.
 _mopup:
-	rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c $(mini_only_src) generate_uudmap$(EXE_EXT) $(generated_headers)
+	$(RMS) *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c $(mini_only_src) generate_uudmap$(EXE_EXT) $(generated_headers)
 	-rmdir .depending
 	-rm *.depends makedepend_file
-	-@test -f extra.pods && rm -f `cat extra.pods`
-	-@test -f vms/README_vms.pod && rm -f vms/README_vms.pod
-	-rm -f perl.exp ext.libs $(generated_pods) uni.data $(mini_only_objs) pod/roffitall
-	-rm -f perl.export perl.dll perl.libexp perl.map perl.def
-	-rm -f *perl.xok
-	-rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
-	-rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl
-	-rm -f config.arch config.over $(DTRACE_H)
+	-@test -f extra.pods && $(RMS) `cat extra.pods`
+	-@test -f vms/README_vms.pod && $(RMS) vms/README_vms.pod
+	$(RMS) perl.exp ext.libs $(generated_pods) uni.data $(mini_only_objs) pod/roffitall
+	$(RMS) perl.export perl.dll perl.libexp perl.map perl.def
+	$(RMS) *perl.xok
+	$(RMS) cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
+	$(RMS) $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl
+	$(RMS) config.arch config.over $(DTRACE_H)
 
 _cleaner1:
-	-cd os2; rm -f Makefile
+	-cd os2; $(RMS) Makefile
 	-cd pod; $(LDLIBPTH) $(MAKE) $(CLEAN)
 	-cd utils; $(LDLIBPTH) $(MAKE) $(CLEAN)
 	-@if test -f $(MINIPERL_EXE) ; then \
@@ -1373,8 +1374,8 @@ _cleaner1:
 	else \
 	sh $(CLEAN).sh ; \
 	fi
-	rm -f realclean.sh veryclean.sh
-	-rm -f `grep -v ^# mkppport.lst | grep . | sed -e 's/$$/\/ppport.h/'`
+	$(RMS) realclean.sh veryclean.sh
+	$(RMS) `grep -v ^# mkppport.lst | grep . | sed -e 's/$$/\/ppport.h/'`
 
 # Dear POSIX, thanks for making the default to xargs to be
 # run once if nothing is passed in. It is such a great help.
@@ -1389,24 +1390,24 @@ _cleaner1:
 # Add new rules before that line - the next line (rm -f so_locations ...) is
 # used as a placeholder by a regen script.
 _cleaner2:
-	-rm -f core.*perl.*.? t/core.perl.*.? .?*.c
-	rm -f core *perl.core t/core t/*perl.core core.* t/core.*
-	rm -f t/$(PERL_EXE) t/rantests
-	rm -rf t/tmp*
-	rm -rf $(addedbyconf)
-	rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old utils/Makefile
-	rm -f $(private)
-	rm -rf $(unidatafiles) $(unidatadirs)
-	rm -rf lib/auto
-	rm -f lib/.exists lib/*/.exists lib/*/*/.exists
-	rm -f h2ph.man
-	rm -rf .config
-	rm -f preload
-	rm -f pod2htmd.tmp
-	rm -rf pod/perlfunc pod/perlipc
+	$(RMS) core.*perl.*.? t/core.perl.*.? .?*.c
+	$(RMS) core *perl.core t/core t/*perl.core core.* t/core.*
+	$(RMS) t/$(PERL_EXE) t/rantests
+	$(RMS_R) t/tmp*
+	$(RMS_R) $(addedbyconf)
+	$(RMS) $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old utils/Makefile
+	$(RMS) $(private)
+	$(RMS_R) $(unidatafiles) $(unidatadirs)
+	$(RMS_R) lib/auto
+	$(RMS) lib/.exists lib/*/.exists lib/*/*/.exists
+	$(RMS) h2ph.man
+	$(RMS_R) .config
+	$(RMS) preload
+	$(RMS) pod2htmd.tmp
+	$(RMS_R) pod/perlfunc pod/perlipc
 	-rmdir ext/B/lib
-	-rm -f dist/Time-HiRes/xdefine
-	rm -f so_locations $(LIBPERL_NONSHR)
+	$(RMS) dist/Time-HiRes/xdefine
+	$(RMS) so_locations $(LIBPERL_NONSHR)
 	-rmdir lib/version lib/threads lib/inc/ExtUtils lib/inc lib/encoding
 	-rmdir lib/autodie/exception lib/autodie/Scope lib/autodie lib/XS
 	-rmdir lib/Win32API lib/VMS lib/Unicode/Collate/Locale
@@ -1457,11 +1458,11 @@ _realcleaner:
 _verycleaner:
 	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=veryclean
 	@$(LDLIBPTH) $(MAKE) _cleaner2
-	-rm -f *~ *.orig */*~ */*.orig */*/*~ */*/*.orig
+	$(RMS) *~ *.orig */*~ */*.orig */*/*~ */*/*.orig
 
 .PHONY: lint
 lint: $(c)
-	rm -f *.ln
+	$(RMS) *.ln
 	lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c)
 
 cscopeflags = -Rb  # Recursive, build-only.
@@ -1522,7 +1523,7 @@ case "$targethost" in
 '') $spitshell >>$Makefile <<'!NO!SUBS!'
 test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
 	$(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) common_build
-	cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
+	cd t && ($(RMS) $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
 
 !NO!SUBS!
 ;;
@@ -1572,7 +1573,7 @@ test_prep test-prep: test_prep_pre \$(MI
 	$to config.sh
 # --- For lib/diagnostics.t with -Duseshrplib
 	$to \$(PERL_EXE)
-	cd t && (rm -f \$(PERL_EXE); \$(LNS) ../\$(PERL_EXE) \$(PERL_EXE)) && cd ..
+	cd t && (\$(RMS) \$(PERL_EXE); \$(LNS) ../\$(PERL_EXE) \$(PERL_EXE)) && cd ..
 	$to t/\$(PERL_EXE)
 
 !GROK!THIS!
@@ -1582,7 +1583,7 @@ esac
 $spitshell >>$Makefile <<'!NO!SUBS!'
 test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
 	$(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
-	cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
+	cd t && ($(RMS) $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
 !NO!SUBS!
 
 case "$targethost" in
@@ -1637,7 +1638,7 @@ minitest_prep: $(MINIPERL_EXE)
 	@echo "You may see some irrelevant test failures if you have been unable"
 	@echo "to build lib/Config.pm, or the Unicode data files."
 	@echo " "
-	cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE))
+	cd t && ($(RMS) $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE))
 
 MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t