commit: e9e2e16d29d344b3a17d0842712ab98114eab0c8
parent 0a85809819a3a67d678a56c0dc8fdc58e1d1f475
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sat, 24 Aug 2024 02:29:23 +0200
switch from heirloom ed to suckless ed
Diffstat:
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/init.sh b/init.sh
@@ -99,8 +99,7 @@ build_hierloom_devtools() {
build_hierloom() {
cd /heirloom-0*/
mkdir -p /usr/5bin /usr/5lib /etc/default /usr/5bin/s42 /usr/5bin/posix2001 /usr/ucb/
- for cmd in libcommon diff tar sort comm find stty\
- libuxre ed
+ for cmd in libcommon diff tar sort comm find stty
do
pdpmake "$cmd"/Makefile
pdpmake -C "$cmd" CC=$CC AR="ar" RANLIB=true
@@ -108,7 +107,6 @@ build_hierloom() {
pdpmake -C "$cmd" CC=$CC AR="ar" RANLIB=true clean
done
ln -fs /usr/5bin/sort /bin/sort
- mv /usr/5bin/ed /usr/bin/ed
mv /usr/5bin/find /usr/bin/find
}
@@ -128,9 +126,12 @@ build_utils_std() {
export PATH="$oldpath"
}
-build_sbase_sed() {
+build_sbase() {
cd /sbase-*/
- $CC -D_DEFAULT_SOURCE -D_NETBSD_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_FILE_OFFSET_BITS=64 -Os -o /bin/sed sed.c libutil/*.c libutf/*.c
+ for i in ed sed
+ do
+ $CC -D_DEFAULT_SOURCE -D_NETBSD_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_FILE_OFFSET_BITS=64 -Os -o "/bin/${i}" "${i}.c" libutil/*.c libutf/*.c
+ done
}
build_oyacc() {
@@ -154,7 +155,7 @@ export SHELL="/bin/loksh"
build_pdpmake || die
-build_sbase_sed || die
+build_sbase || die
# stubs for utilities currently missing from utils-std
build_stubs || die
diff --git a/make-root.sh b/make-root.sh
@@ -227,6 +227,10 @@ sed -i \
sed -i -e 's;libwchar.a: fake;libwchar.a:;' heirloom-070715/libwchar/Makefile.mk || die
+sed -i -e 's;getdir.o regexpr.o gmatch.o;getdir.o gmatch.o;' heirloom-*/libcommon/Makefile.mk || die
+
+rm -r heirloom-*/libuxre heirloom-*/libcommon/regexp.h || die
+
rm -r pigz-*/zopfli || die
rm -r heirloom-devtools-*/make heirloom-devtools-*/sccs || die
