HCoop / jackhill / guix / guix.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
gnu: emacs-consult: Fix grammar.
[jackhill/guix/guix.git] / gnu / packages / patches / chez-scheme-build-util-paths-backport.patch
CommitLineData
e29b1fff
PM		 1From 2447e047b750c3371778beb487f881641a582e66 Mon Sep 17 00:00:00 2001
2From: Philip McGrath <philip@philipmcgrath.com>
3Date: Thu, 11 Mar 2021 18:17:47 -0500
4Subject: [PATCH] avoid hard-coded paths for utilities in build scripts
5
6Backported from
7https://github.com/cisco/ChezScheme/commit/8f4633ce24ac6425b2ab13cc78026b1c9bb5361e
8
9Specific changes:
10 - `cc` -> `$(CC)`
11 - `/bin/rm` -> `rm`
12 - `/bin/ln` -> `ln`
13 - `/bin/cp` -> `cp`
14 - `/bin/echo` -> `echo`
15 - in `makefiles/installsh`, add a case to find `true`
16 at an unusual path or as a shell builtin
17
18Co-authored-by: Andy Keep <akeep@robotman.org>
19---
20 LOG | 12 ++++++++++++
21 csug/gifs/Makefile | 8 ++++----
22 csug/math/Makefile | 4 ++--
23 examples/Makefile | 2 +-
24 makefiles/Makefile-csug.in | 6 +++---
25 makefiles/Makefile-release_notes.in | 2 +-
26 makefiles/Mf-install.in | 4 ++--
27 makefiles/installsh | 3 ++-
28 mats/6.ms | 2 +-
29 mats/Mf-a6fb | 4 ++--
30 mats/Mf-a6le | 4 ++--
31 mats/Mf-a6nb | 4 ++--
32 mats/Mf-a6ob | 4 ++--
33 mats/Mf-a6osx | 4 ++--
34 mats/Mf-arm32le | 4 ++--
35 mats/Mf-i3fb | 4 ++--
36 mats/Mf-i3le | 4 ++--
37 mats/Mf-i3nb | 4 ++--
38 mats/Mf-i3ob | 4 ++--
39 mats/Mf-i3osx | 4 ++--
40 mats/Mf-i3qnx | 4 ++--
41 mats/Mf-ppc32le | 4 ++--
42 mats/Mf-ta6fb | 4 ++--
43 mats/Mf-ta6le | 4 ++--
44 mats/Mf-ta6nb | 4 ++--
45 mats/Mf-ta6ob | 4 ++--
46 mats/Mf-ta6osx | 4 ++--
47 mats/Mf-ti3fb | 4 ++--
48 mats/Mf-ti3le | 4 ++--
49 mats/Mf-ti3nb | 4 ++--
50 mats/Mf-ti3ob | 4 ++--
51 mats/Mf-ti3osx | 4 ++--
52 mats/Mf-tppc32le | 4 ++--
53 mats/unix.ms | 4 ++--
54 newrelease | 22 +++++++++++-----------
55 pkg/Makefile | 2 +-
56 release_notes/gifs/Makefile | 6 +++---
57 release_notes/math/Makefile | 4 ++--
58 s/Mf-base | 2 +-
59 workarea | 10 +++++-----
60 40 files changed, 101 insertions(+), 88 deletions(-)
61
62diff --git a/LOG b/LOG
63index e1631df..399104d 100644
64--- a/LOG
65+++ b/LOG
66@@ -2119,3 +2119,15 @@
67 bintar/Makefile rpm/Makefile pkg/Makefile wininstall/Makefile
68 wininstall/a6nt.wxs wininstall/i3nt.wxs wininstall/ta6nt.wxs
69 wininstall/ti3nt.wxs
70+9.5.5 changes:
71+- avoid hard-coded paths for utilities in build scripts
72+ checkin csug/gifs/Makefile csug/math/Makefile examples/Makefile
73+ makefiles/Makefile-csug.in makefiles/Makefile-release_notes.in
74+ makefiles/Mf-install.in makefiles/installsh mats/6.ms mats/Mf-a6fb
75+ mats/Mf-a6le mats/Mf-a6nb mats/Mf-a6ob mats/Mf-a6osx mats/Mf-arm32le
76+ mats/Mf-i3fb mats/Mf-i3le mats/Mf-i3nb mats/Mf-i3ob mats/Mf-i3osx
77+ mats/Mf-i3qnx mats/Mf-ppc32le mats/Mf-ta6fb mats/Mf-ta6le mats/Mf-ta6nb
78+ mats/Mf-ta6ob mats/Mf-ta6osx mats/Mf-ti3fb mats/Mf-ti3le mats/Mf-ti3nb
79+ mats/Mf-ti3ob mats/Mf-ti3osx mats/Mf-tppc32le mats/unix.ms newrelease
80+ pkg/Makefile release_notes/gifs/Makefile release_notes/math/Makefile
81+ s/Mf-base workarea
82diff --git a/csug/gifs/Makefile b/csug/gifs/Makefile
83index 8676e4c..4253ffd 100644
84--- a/csug/gifs/Makefile
85+++ b/csug/gifs/Makefile
86@@ -18,7 +18,7 @@ density=-r90x90
87 ${density} - |\
88 pnmcrop |\
89 ppmtogif -transparent white > $*.gif
90- /bin/rm -f $*.dvi $*.log *.aux
91+ rm -f $*.dvi $*.log *.aux
92 test -f $*.gif && chmod 644 $*.gif
93
94 # translate ps file to gif w/o transparent white background
95@@ -28,7 +28,7 @@ density=-r90x90
96 ${density} - |\
97 pnmcrop |\
98 ppmtogif > $*.gif
99- /bin/rm -f $*.dvi $*.log *.aux
100+ rm -f $*.dvi $*.log *.aux
101 test -f $*.gif && chmod 644 $*.gif
102
103 all: ${gifs}
104@@ -57,7 +57,7 @@ ghostRightarrow.gif: Rightarrow.tex
105 giftrans -g '#000000=#ffffff' |\
106 giftopnm |\
107 ppmtogif -transparent white > $*.gif
108- /bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux
109+ rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux
110 test -f $*.gif && chmod 644 $*.gif
111
112-clean: ; /bin/rm -f *.gif Make.out
113+clean: ; rm -f *.gif Make.out
114diff --git a/csug/math/Makefile b/csug/math/Makefile
115index 3385fdb..3392ea8 100644
116--- a/csug/math/Makefile
117+++ b/csug/math/Makefile
118@@ -15,11 +15,11 @@ density=-r90x90
119 ${density} - |\
120 pnmcrop |\
121 ppmtogif -transparent white > $*.gif
122- /bin/rm -f $*.dvi $*.log $*.aux
123+ rm -f $*.dvi $*.log $*.aux
124 test -f $*.gif && chmod 644 $*.gif
125
126 all: ${gifs}
127
128 ${gifs}: mathmacros
129
130-clean: ; /bin/rm -f *.gif Make.out
131+clean: ; rm -f *.gif Make.out
132diff --git a/examples/Makefile b/examples/Makefile
133index b1b4e1d..3edfdd0 100644
134--- a/examples/Makefile
135+++ b/examples/Makefile
136@@ -25,4 +25,4 @@ needed: ${obj}
137
138 all: ; echo "(time (for-each compile-file (map symbol->string '(${src}))))" | ${Scheme}
139
140-clean: ; /bin/rm -f $(obj) expr.md
141+clean: ; rm -f $(obj) expr.md
142diff --git a/makefiles/Makefile-csug.in b/makefiles/Makefile-csug.in
143index df24092..6f8a8d9 100644
144--- a/makefiles/Makefile-csug.in
145+++ b/makefiles/Makefile-csug.in
146@@ -29,7 +29,7 @@ install: target
147 # thrice is not enough when starting from scratch
148 logcheck1: $(x).thirdrun
149 @if [ -n "`grep 'Warning: Label(s) may have changed' $(x).log`" ] ; then\
150- /bin/rm -f $(x).thirdrun ;\
151+ rm -f $(x).thirdrun ;\
152 $(MAKE) $(x).thirdrun;\
153 fi
154
155@@ -55,7 +55,7 @@ stexsrc = csug.stex title.stex copyright.stex contents.stex\
156 texsrc = ${stexsrc:%.stex=%.tex}
157
158 title.tex contents.tex bibliography.tex:
159- /bin/rm -f $*.tex
160+ rm -f $*.tex
161 echo "%%% DO NOT EDIT THIS FILE" > $*.tex
162 echo "%%% Edit the .stex version instead" >> $*.tex
163 echo "" >> $*.tex
164@@ -147,7 +147,7 @@ code: $(stexsrc)
165 echo '(load "code" pretty-print)' | $(Scheme) -q
166
167 $(x).clean:
168- -/bin/rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\
169+ -rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\
170 $(x).prethirdrun $(x).ans\
171 $(x).hprefirstrun $(x).hpresecondrun $(x).hprethirdrun\
172 tspl.aux tspl.haux tspl.rfm tspl.idx in.hidx\
173diff --git a/makefiles/Makefile-release_notes.in b/makefiles/Makefile-release_notes.in
174index 4435b6f..64348a4 100644
175--- a/makefiles/Makefile-release_notes.in
176+++ b/makefiles/Makefile-release_notes.in
177@@ -38,7 +38,7 @@ install: $x.pdf $x.html
178 $(INSTALL) -m 2755 -d $(installdir)/gifs
179 $(INSTALL) -m 0644 --ifdiff gifs/*.gif $(installdir)/gifs
180 $(INSTALL) -m 2755 -d $(installdir)/math
181- -/bin/rm -rf $(installdir)/$(mathdir)
182+ -rm -rf $(installdir)/$(mathdir)
183 $(INSTALL) -m 2755 -d $(installdir)/$(mathdir)
184 if [ -e $(mathdir)/0.gif ] ; then $(INSTALL) -m 0644 $(mathdir)/*.gif $(installdir)/$(mathdir) ; fi
185
186diff --git a/makefiles/Mf-install.in b/makefiles/Mf-install.in
187index a702c34..c09043d 100644
188--- a/makefiles/Mf-install.in
189+++ b/makefiles/Mf-install.in
190@@ -114,12 +114,12 @@ bininstall: ${Bin}
191 libbininstall: ${LibBin}
192 $I -m 444 ${PetiteBoot} ${LibBin}/petite.boot
193 if [ "${InstallPetiteName}" != "petite" ]; then\
194- /bin/rm -f ${LibBin}/${InstallPetiteName}.boot;\
195+ rm -f ${LibBin}/${InstallPetiteName}.boot;\
196 ln -f ${LibBin}/petite.boot ${LibBin}/${InstallPetiteName}.boot;\
197 fi
198 $I -m 444 ${SchemeBoot} ${LibBin}/scheme.boot;\
199 if [ "${InstallSchemeName}" != "scheme" ]; then\
200- /bin/rm -f ${LibBin}/${InstallSchemeName}.boot;\
201+ rm -f ${LibBin}/${InstallSchemeName}.boot;\
202 ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallSchemeName}.boot;\
203 fi
204 ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallScriptName}.boot;
205diff --git a/makefiles/installsh b/makefiles/installsh
206index 48f1e46..95d85fb 100755
207--- a/makefiles/installsh
208+++ b/makefiles/installsh
209@@ -1,7 +1,8 @@
210 #! /bin/sh
211 if [ -x /bin/true ]; then TRUE=/bin/true;
212 elif [ -x /usr/bin/true ]; then TRUE=/usr/bin/true;
213-else echo "Can't find /bin/true or /usr/bin/true" ; exit 1;
214+elif command -v true &> /dev/null; then TRUE=true;
215+else echo "Can't find /bin/true or /usr/bin/true and no true command" ; exit 1;
216 fi
217
218 while ${TRUE} ; do
219diff --git a/mats/6.ms b/mats/6.ms
220index 102f84b..e504230 100644
221--- a/mats/6.ms
222+++ b/mats/6.ms
223@@ -2685,7 +2685,7 @@
224 (begin
225 (system "ln -s ../examples .")
226 (load "examples/fatfib.ss" compile)
227- (system "/bin/rm examples")
228+ (system "rm -f examples")
229 #t))
230 (or (windows?) (embedded?)
231 (equal?
232diff --git a/mats/Mf-a6fb b/mats/Mf-a6fb
233index b16d1b6..ff9e687 100644
234--- a/mats/Mf-a6fb
235+++ b/mats/Mf-a6fb
236@@ -21,7 +21,7 @@ fobj = foreign1.so
237 include Mf-base
238
239 foreign1.so: ${fsrc} ../boot/$m/scheme.h
240- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
241+ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
242
243 cat_flush: cat_flush.c
244- cc -o cat_flush cat_flush.c
245+ $(CC) -o cat_flush cat_flush.c
246diff --git a/mats/Mf-a6le b/mats/Mf-a6le
247index d6fee09..a3bda76 100644
248--- a/mats/Mf-a6le
249+++ b/mats/Mf-a6le
250@@ -21,7 +21,7 @@ fobj = foreign1.so
251 include Mf-base
252
253 foreign1.so: ${fsrc} ../boot/$m/scheme.h
254- cc -m64 -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
255+ $(CC) -m64 -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
256
257 cat_flush: cat_flush.c
258- cc -o cat_flush cat_flush.c
259+ $(CC) -o cat_flush cat_flush.c
260diff --git a/mats/Mf-a6nb b/mats/Mf-a6nb
261index 48187ef..0f7ac17 100644
262--- a/mats/Mf-a6nb
263+++ b/mats/Mf-a6nb
264@@ -21,7 +21,7 @@ fobj = foreign1.so
265 include Mf-base
266
267 foreign1.so: ${fsrc} ../boot/$m/scheme.h
268- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
269+ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
270
271 cat_flush: cat_flush.c
272- cc -o cat_flush cat_flush.c
273+ $(CC) -o cat_flush cat_flush.c
274diff --git a/mats/Mf-a6ob b/mats/Mf-a6ob
275index 12758f3..0ffcccc 100644
276--- a/mats/Mf-a6ob
277+++ b/mats/Mf-a6ob
278@@ -21,7 +21,7 @@ fobj = foreign1.so
279 include Mf-base
280
281 foreign1.so: ${fsrc} ../boot/$m/scheme.h
282- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
283+ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
284
285 cat_flush: cat_flush.c
286- cc -o cat_flush cat_flush.c
287+ $(CC) -o cat_flush cat_flush.c
288diff --git a/mats/Mf-a6osx b/mats/Mf-a6osx
289index f1dbf85..57bac22 100644
290--- a/mats/Mf-a6osx
291+++ b/mats/Mf-a6osx
292@@ -21,7 +21,7 @@ fobj = foreign1.so
293 include Mf-base
294
295 foreign1.so: ${fsrc} ../boot/$m/scheme.h
296- cc -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
297+ $(CC) -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
298
299 cat_flush: cat_flush.c
300- cc -o cat_flush cat_flush.c
301+ $(CC) -o cat_flush cat_flush.c
302diff --git a/mats/Mf-arm32le b/mats/Mf-arm32le
303index f33a665..83896eb 100644
304--- a/mats/Mf-arm32le
305+++ b/mats/Mf-arm32le
306@@ -21,7 +21,7 @@ fobj = foreign1.so
307 include Mf-base
308
309 foreign1.so: ${fsrc} ../boot/$m/scheme.h
310- cc -fPIC -fomit-frame-pointer -shared -I${Include} -o foreign1.so ${fsrc}
311+ $(CC) -fPIC -fomit-frame-pointer -shared -I${Include} -o foreign1.so ${fsrc}
312
313 cat_flush: cat_flush.c
314- cc -o cat_flush cat_flush.c
315+ $(CC) -o cat_flush cat_flush.c
316diff --git a/mats/Mf-i3fb b/mats/Mf-i3fb
317index 150cedb..1e4e8fc 100644
318--- a/mats/Mf-i3fb
319+++ b/mats/Mf-i3fb
320@@ -21,7 +21,7 @@ fobj = foreign1.so
321 include Mf-base
322
323 foreign1.so: ${fsrc} ../boot/$m/scheme.h
324- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
325+ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
326
327 cat_flush: cat_flush.c
328- cc -o cat_flush cat_flush.c
329+ $(CC) -o cat_flush cat_flush.c
330diff --git a/mats/Mf-i3le b/mats/Mf-i3le
331index 8f521c8..b248620 100644
332--- a/mats/Mf-i3le
333+++ b/mats/Mf-i3le
334@@ -21,7 +21,7 @@ fobj = foreign1.so
335 include Mf-base
336
337 foreign1.so: ${fsrc} ../boot/$m/scheme.h
338- cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
339+ $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
340
341 cat_flush: cat_flush.c
342- cc -o cat_flush cat_flush.c
343+ $(CC) -o cat_flush cat_flush.c
344diff --git a/mats/Mf-i3nb b/mats/Mf-i3nb
345index e81f6ff..8afeb5c 100644
346--- a/mats/Mf-i3nb
347+++ b/mats/Mf-i3nb
348@@ -21,7 +21,7 @@ fobj = foreign1.so
349 include Mf-base
350
351 foreign1.so: ${fsrc} ../boot/$m/scheme.h
352- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
353+ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
354
355 cat_flush: cat_flush.c
356- cc -o cat_flush cat_flush.c
357+ $(CC) -o cat_flush cat_flush.c
358diff --git a/mats/Mf-i3ob b/mats/Mf-i3ob
359index 4e3ee1b..fcd4dee 100644
360--- a/mats/Mf-i3ob
361+++ b/mats/Mf-i3ob
362@@ -21,7 +21,7 @@ fobj = foreign1.so
363 include Mf-base
364
365 foreign1.so: ${fsrc} ../boot/$m/scheme.h
366- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
367+ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
368
369 cat_flush: cat_flush.c
370- cc -o cat_flush cat_flush.c
371+ $(CC) -o cat_flush cat_flush.c
372diff --git a/mats/Mf-i3osx b/mats/Mf-i3osx
373index 53c7d4a..a55f6ee 100644
374--- a/mats/Mf-i3osx
375+++ b/mats/Mf-i3osx
376@@ -21,7 +21,7 @@ fobj = foreign1.so
377 include Mf-base
378
379 foreign1.so: ${fsrc} ../boot/$m/scheme.h
380- cc -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
381+ $(CC) -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
382
383 cat_flush: cat_flush.c
384- cc -o cat_flush cat_flush.c
385+ $(CC) -o cat_flush cat_flush.c
386diff --git a/mats/Mf-i3qnx b/mats/Mf-i3qnx
387index 724f2db..3e1437a 100644
388--- a/mats/Mf-i3qnx
389+++ b/mats/Mf-i3qnx
390@@ -21,7 +21,7 @@ fobj = foreign1.so
391 include Mf-base
392
393 foreign1.so: ${fsrc} ../boot/$m/scheme.h
394- cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
395+ $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
396
397 cat_flush: cat_flush.c
398- cc -o cat_flush cat_flush.c
399+ $(CC) -o cat_flush cat_flush.c
400diff --git a/mats/Mf-ppc32le b/mats/Mf-ppc32le
401index 28151a8..547ca00 100644
402--- a/mats/Mf-ppc32le
403+++ b/mats/Mf-ppc32le
404@@ -21,7 +21,7 @@ fobj = foreign1.so
405 include Mf-base
406
407 foreign1.so: ${fsrc} ../boot/$m/scheme.h
408- cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
409+ $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
410
411 cat_flush: cat_flush.c
412- cc -o cat_flush cat_flush.c
413+ $(CC) -o cat_flush cat_flush.c
414diff --git a/mats/Mf-ta6fb b/mats/Mf-ta6fb
415index 921d609..5ed233e 100644
416--- a/mats/Mf-ta6fb
417+++ b/mats/Mf-ta6fb
418@@ -21,7 +21,7 @@ fobj = foreign1.so
419 include Mf-base
420
421 foreign1.so: ${fsrc} ../boot/$m/scheme.h
422- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
423+ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
424
425 cat_flush: cat_flush.c
426- cc -o cat_flush cat_flush.c
427+ $(CC) -o cat_flush cat_flush.c
428diff --git a/mats/Mf-ta6le b/mats/Mf-ta6le
429index cd014ec..21c686a 100644
430--- a/mats/Mf-ta6le
431+++ b/mats/Mf-ta6le
432@@ -21,7 +21,7 @@ fobj = foreign1.so
433 include Mf-base
434
435 foreign1.so: ${fsrc} ../boot/$m/scheme.h
436- cc -m64 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
437+ $(CC) -m64 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
438
439 cat_flush: cat_flush.c
440- cc -o cat_flush cat_flush.c
441+ $(CC) -o cat_flush cat_flush.c
442diff --git a/mats/Mf-ta6nb b/mats/Mf-ta6nb
443index 6b1929d..9b9b898 100644
444--- a/mats/Mf-ta6nb
445+++ b/mats/Mf-ta6nb
446@@ -21,7 +21,7 @@ fobj = foreign1.so
447 include Mf-base
448
449 foreign1.so: ${fsrc} ../boot/$m/scheme.h
450- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
451+ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
452
453 cat_flush: cat_flush.c
454- cc -o cat_flush cat_flush.c
455+ $(CC) -o cat_flush cat_flush.c
456diff --git a/mats/Mf-ta6ob b/mats/Mf-ta6ob
457index a7aee91..8f25aed 100644
458--- a/mats/Mf-ta6ob
459+++ b/mats/Mf-ta6ob
460@@ -21,7 +21,7 @@ fobj = foreign1.so
461 include Mf-base
462
463 foreign1.so: ${fsrc} ../boot/$m/scheme.h
464- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
465+ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
466
467 cat_flush: cat_flush.c
468- cc -o cat_flush cat_flush.c
469+ $(CC) -o cat_flush cat_flush.c
470diff --git a/mats/Mf-ta6osx b/mats/Mf-ta6osx
471index 42da5d7..0dd386f 100644
472--- a/mats/Mf-ta6osx
473+++ b/mats/Mf-ta6osx
474@@ -21,7 +21,7 @@ fobj = foreign1.so
475 include Mf-base
476
477 foreign1.so: ${fsrc} ../boot/$m/scheme.h
478- cc -m64 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
479+ $(CC) -m64 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
480
481 cat_flush: cat_flush.c
482- cc -o cat_flush cat_flush.c
483+ $(CC) -o cat_flush cat_flush.c
484diff --git a/mats/Mf-ti3fb b/mats/Mf-ti3fb
485index c891145..56bf7d3 100644
486--- a/mats/Mf-ti3fb
487+++ b/mats/Mf-ti3fb
488@@ -21,7 +21,7 @@ fobj = foreign1.so
489 include Mf-base
490
491 foreign1.so: ${fsrc} ../boot/$m/scheme.h
492- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
493+ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
494
495 cat_flush: cat_flush.c
496- cc -o cat_flush cat_flush.c
497+ $(CC) -o cat_flush cat_flush.c
498diff --git a/mats/Mf-ti3le b/mats/Mf-ti3le
499index 12e77b8..22b4148 100644
500--- a/mats/Mf-ti3le
501+++ b/mats/Mf-ti3le
502@@ -21,7 +21,7 @@ fobj = foreign1.so
503 include Mf-base
504
505 foreign1.so: ${fsrc} ../boot/$m/scheme.h
506- cc -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
507+ $(CC) -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
508
509 cat_flush: cat_flush.c
510- cc -o cat_flush cat_flush.c
511+ $(CC) -o cat_flush cat_flush.c
512diff --git a/mats/Mf-ti3nb b/mats/Mf-ti3nb
513index 028c652..573946e 100644
514--- a/mats/Mf-ti3nb
515+++ b/mats/Mf-ti3nb
516@@ -21,7 +21,7 @@ fobj = foreign1.so
517 include Mf-base
518
519 foreign1.so: ${fsrc} ../boot/$m/scheme.h
520- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
521+ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
522
523 cat_flush: cat_flush.c
524- cc -o cat_flush cat_flush.c
525+ $(CC) -o cat_flush cat_flush.c
526diff --git a/mats/Mf-ti3ob b/mats/Mf-ti3ob
527index 8a4741c..4472b60 100644
528--- a/mats/Mf-ti3ob
529+++ b/mats/Mf-ti3ob
530@@ -21,7 +21,7 @@ fobj = foreign1.so
531 include Mf-base
532
533 foreign1.so: ${fsrc} ../boot/$m/scheme.h
534- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
535+ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
536
537 cat_flush: cat_flush.c
538- cc -o cat_flush cat_flush.c
539+ $(CC) -o cat_flush cat_flush.c
540diff --git a/mats/Mf-ti3osx b/mats/Mf-ti3osx
541index 6913c34..9273b44 100644
542--- a/mats/Mf-ti3osx
543+++ b/mats/Mf-ti3osx
544@@ -21,7 +21,7 @@ fobj = foreign1.so
545 include Mf-base
546
547 foreign1.so: ${fsrc} ../boot/$m/scheme.h
548- cc -m32 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
549+ $(CC) -m32 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc}
550
551 cat_flush: cat_flush.c
552- cc -o cat_flush cat_flush.c
553+ $(CC) -o cat_flush cat_flush.c
554diff --git a/mats/Mf-tppc32le b/mats/Mf-tppc32le
555index a12b515..8b9d9f0 100644
556--- a/mats/Mf-tppc32le
557+++ b/mats/Mf-tppc32le
558@@ -21,7 +21,7 @@ fobj = foreign1.so
559 include Mf-base
560
561 foreign1.so: ${fsrc} ../boot/$m/scheme.h
562- cc -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
563+ $(CC) -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc}
564
565 cat_flush: cat_flush.c
566- cc -o cat_flush cat_flush.c
567+ $(CC) -o cat_flush cat_flush.c
568diff --git a/mats/unix.ms b/mats/unix.ms
569index cfba3e7..db7f6f9 100644
570--- a/mats/unix.ms
571+++ b/mats/unix.ms
572@@ -72,8 +72,8 @@
573 (mat system
574 (eqv? (with-output-to-file "testfile.ss" void '(replace)) (void))
575 (begin
576- (system (format "~:[~;/pkg~]/bin/rm testfile.ss" (embedded?)))
577- (system (format "~:[~;/pkg~]/bin/echo hello > testfile.ss" (embedded?)))
578+ (system "rm -f testfile.ss")
579+ (system "echo hello > testfile.ss")
580 (let ([p (open-input-file "testfile.ss")])
581 (and (eq? (read p) 'hello)
582 (begin (close-input-port p) #t))))
583diff --git a/newrelease b/newrelease
584index e903956..2d06740 100755
585--- a/newrelease
586+++ b/newrelease
587@@ -75,13 +75,13 @@ if ($status != 0) exit 1
588
589 cd $W
590
591-/bin/rm -f BUILDING
592+rm -f BUILDING
593 sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \
594 -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \
595 ../BUILDING > BUILDING
596 set updatedfiles = ($updatedfiles BUILDING)
597
598-/bin/rm -f NOTICE
599+rm -f NOTICE
600 sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \
601 -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \
602 ../NOTICE > NOTICE
603@@ -92,19 +92,19 @@ sed -e "s/csv[0-9]\.[0-9]\(\.[0-9]\)*/csv$R/" ../makefiles/Mf-install.in > makef
604 sed -e "s/csug[0-9]\.[0-9]/csug$MR.$mR/" -e "s/csug[0-9]_[0-9]/csug$MR""_$mR/" ../makefiles/Makefile-csug.in > makefiles/Makefile-csug.in
605 set updatedfiles = ($updatedfiles makefiles/Mf-install.in makefiles/Makefile-csug.in)
606
607-/bin/rm scheme.1.in
608+rm -f scheme.1.in
609 sed -e "s/Chez Scheme Version [0-9]\.[0-9]\(\.[0-9]\)* .* [0-9][0-9]*/Chez Scheme Version $R `date +'%B %Y'`/" \
610 -e "s/Copyright .* Cisco Systems, Inc./Copyright `date +%Y` Cisco Systems, Inc./" \
611 ../scheme.1.in > scheme.1.in
612 set updatedfiles = ($updatedfiles scheme.1.in)
613
614-/bin/rm -f c/Makefile.{,t}{i3,a6}nt
615+rm -f c/Makefile.{,t}{i3,a6}nt
616 foreach fn (c/Makefile.{,t}{a6,i3}nt)
617 set updatedfiles = ($updatedfiles $fn)
618 sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn
619 end
620
621-/bin/rm -f mats/Mf-{,t}{i3,a6}nt
622+rm -f mats/Mf-{,t}{i3,a6}nt
623 foreach fn (mats/Mf-{,t}{a6,i3}nt)
624 set updatedfiles = ($updatedfiles $fn)
625 sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn
626@@ -123,11 +123,11 @@ sed -e "s/FILEVERSION .*/FILEVERSION $RCVERSION/"\
627 -e "s/Copyright 1984-..../Copyright 1984-`date +%Y`/g" ../c/scheme.rc > c/scheme.rc
628 set updatedfiles = ($updatedfiles c/scheme.rc)
629
630-/bin/rm -f s/7.ss
631+rm -f s/7.ss
632 sed -e "s/nCopyright 1984-..../nCopyright 1984-`date +%Y`/g" ../s/7.ss > s/7.ss
633 set updatedfiles = ($updatedfiles s/7.ss)
634
635-/bin/rm -f s/cmacros.ss
636+rm -f s/cmacros.ss
637 set VNUM = `printf "%04x%02x%02x" $MR $mR $bR`
638 sed -e "s/scheme-version #x......../scheme-version #x$VNUM/" ../s/cmacros.ss > s/cmacros.ss
639 set updatedfiles = ($updatedfiles s/cmacros.ss)
640@@ -146,17 +146,17 @@ sed -e "s/Revised\(.*\)for Chez Scheme Version [^ ]*<br>/Revised\1for Chez Schem
641 ../csug/csug.stex > csug/csug.stex
642 set updatedfiles = ($updatedfiles csug/copyright.stex csug/csug.stex)
643
644-/bin/rm bintar/Makefile
645+rm -f bintar/Makefile
646 sed -e "s/^version = .*/version = $R/" \
647 -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" \
648 ../bintar/Makefile > bintar/Makefile
649 set updatedfiles = ($updatedfiles bintar/Makefile)
650
651-/bin/rm rpm/Makefile
652+rm -f rpm/Makefile
653 sed -e "s/^version = .*/version = $R/" ../rpm/Makefile > rpm/Makefile
654 set updatedfiles = ($updatedfiles rpm/Makefile)
655
656-/bin/rm pkg/Makefile
657+rm -f pkg/Makefile
658 sed -e "s/^version = .*/version = $R/" \
659 -e "s/&copy; .* Cisco Systems/\&copy; `date +%Y` Cisco Systems/" \
660 ../pkg/Makefile > pkg/Makefile
661@@ -170,7 +170,7 @@ foreach fn (wininstall/{,t}{a6,i3}nt.wxs)
662 sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/" ../$fn > $fn
663 end
664
665-/bin/rm LOG
666+rm -f LOG
667 cat ../LOG > LOG
668 echo "" >> LOG
669 echo "$R changes:" >> LOG
670diff --git a/pkg/Makefile b/pkg/Makefile
671index e0eef67..a3fe83f 100644
672--- a/pkg/Makefile
673+++ b/pkg/Makefile
674@@ -39,7 +39,7 @@ $(PKG): $(BUILDROOT)/$(PKG)
675 --package-path $(BUILDROOT)\
676 $(PKG)
677 sudo chown $(DOTUSER):$(DOTGROUP) $(PKG)
678- sudo /bin/rm -rf $(RELEASE) $(BUILDROOT)
679+ sudo rm -rf $(RELEASE) $(BUILDROOT)
680
681 $(BUILDROOT)/$(PKG): $(PKGCONTENT)
682 sudo /usr/bin/pkgbuild\
683diff --git a/release_notes/gifs/Makefile b/release_notes/gifs/Makefile
684index 9572965..701d53a 100644
685--- a/release_notes/gifs/Makefile
686+++ b/release_notes/gifs/Makefile
687@@ -15,7 +15,7 @@ density=-r90x90
688 ${density} - |\
689 pnmcrop |\
690 ppmtogif -transparent white > $*.gif
691- /bin/rm -f $*.dvi $*.log *.aux
692+ rm -f $*.dvi $*.log *.aux
693 test -f $*.gif && chmod 644 $*.gif
694
695 all: ${gifs}
696@@ -44,7 +44,7 @@ ghostRightarrow.gif: Rightarrow.tex
697 giftrans -g '#000000=#ffffff' |\
698 giftopnm |\
699 ppmtogif -transparent white > $*.gif
700- /bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux
701+ rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux
702 test -f $*.gif && chmod 644 $*.gif
703
704-clean: ; /bin/rm -f *.gif Make.out
705+clean: ; rm -f *.gif Make.out
706diff --git a/release_notes/math/Makefile b/release_notes/math/Makefile
707index b3ffae3..9eca430 100644
708--- a/release_notes/math/Makefile
709+++ b/release_notes/math/Makefile
710@@ -16,11 +16,11 @@ density=-r90x90
711 ${density} - |\
712 pnmcrop |\
713 ppmtogif -transparent white > $*.gif
714- /bin/rm -f $*.dvi $*.log $*.aux
715+ rm -f $*.dvi $*.log $*.aux
716 test -f $*.gif && chmod 644 $*.gif
717
718 all: ${gifs}
719
720 ${gifs}: mathmacros
721
722-clean: ; /bin/rm -f *.gif Make.out
723+clean: ; rm -f *.gif Make.out
724diff --git a/s/Mf-base b/s/Mf-base
725index c709608..40d816c 100644
726--- a/s/Mf-base
727+++ b/s/Mf-base
728@@ -206,7 +206,7 @@ profiled:
729 $(MAKE) all loadspd=t bp=t PetiteBoot=../boot/$m/xpetite.boot SchemeBoot=../boot/$m/xscheme.boot
730 $(MAKE) prettyclean
731 $(MAKE) io.$m loadspd=t dumpbpd=t Scheme="../bin/$m/scheme -b ../boot/$m/xpetite.boot -b ../boot/$m/xscheme.boot"
732- /bin/rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot
733+ rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot
734 $(MAKE) prettyclean
735 $(MAKE) all loadspd=t loadbpd=t
736
737diff --git a/workarea b/workarea
738index bacc712..0461919 100755
739--- a/workarea
740+++ b/workarea
741@@ -70,9 +70,9 @@ esac
742
743 if [ "$OS" = "Windows_NT" ]
744 then
745- ln="/bin/cp -R"
746+ ln="cp -R"
747 else
748- ln="/bin/ln -s"
749+ ln="ln -s"
750 fi
751
752 # This shell script creates a workarea for local modifications to the
753@@ -102,7 +102,7 @@ workln()
754 forceworkln()
755 {
756 if [ ! -e $2 ] ; then
757- /bin/ln -s $1 $2 2> /dev/null
758+ ln -s $1 $2 2> /dev/null
759 fi
760 }
761
762@@ -168,13 +168,13 @@ done
763 # deep copy submodules where builds occur so changes don't propagate through symlinks
764 for dir in `echo zlib` ; do
765 if [ ! -e $W/$dir ] ; then
766- /bin/cp -R $dir $W/$dir
767+ cp -R $dir $W/$dir
768 fi
769 done
770
771 for dir in `echo lz4` ; do
772 if [ ! -e $W/$dir ] ; then
773- /bin/cp -R $dir $W/$dir
774+ cp -R $dir $W/$dir
775 fi
776 done
777
778--
7792.21.1 (Apple Git-122.3)
780
jackhill's copy of GNU Guix: https://guix.gnu.org/