commit: a214b932d94ef4be492721b0d79127c3cb5e3d08
parent bd23a3e0ff2b53a43baf05248fe84db4e0263acf
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Fri, 14 Jun 2024 01:14:15 +0200
Bump pdpmake to 2.0.0
Diffstat:
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -40,7 +40,7 @@ d53eb37351487156e8c43e27ef0f841fd6cb54c7a21802356177cf4657e008e5b6cb9329234e26f2
85b90bdd99acfc0dd15759116844a5da005397111717c446bdebc2134e464782c02682ac2cff1bc64c17c538de7af8e25655eea472439a277a5f190bb7a48280 distfiles/musl-libintl-1.2.5-r1.apk.x86
4646f0250ac672b12ca5050ccebb08641873fae2dd93fd35813143a3dc621540ccc13361c1b224c5df3f6c5dc48e579ee8132d509ca25978370225f03f4c6c2b distfiles/musl-libintl-1.2.5-r1.apk.x86_64
3d5626b0d6033a9eb8f3d81acbe0b30842e99f4c40563ca3f906ecfebdb72d754de18cd180345131868ad325fead4a6e66bfb765af45267180e256f46a76f316 distfiles/nawk-20240422.tar.gz
-3f43685eeaeea15d55d4a6e7ca6f8a36d344e4f5096aca19f56b696db79dcf6a7d9593cef1d99b15d1a025ee45c23a4e1c217800bbc6006afacf20468c547d31 distfiles/pdpmake-1.4.2.tgz
+05913dcc9263300797e9b1df45d2afbb04ae8e6a527f0bbd1b59453b4818cf516b877823a06e771f77e7d1ffbf458d9bdb75146e69093129bd6ff2d831dfd9b0 distfiles/pdpmake-2.0.0.tgz
ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f distfiles/pigz-2.8.tar.gz
0ca21e4e390c57c3ad8bfeb9f8d92e65c6a60f28c2a962c1b64e268610b8d88fd502febad23264aed45db68a67dd83321b10f4e896718ab869d4ae743d769676 distfiles/pkgconf-2.2.0.tar.gz
b050d22a0446e3e2439f59762f3b40104bc1c8361c6ac17a410c0d13c06af497470d468ba50de97b50181a959ae3189b2dba089162dbade536803c8ff96b2d83 distfiles/sbase-b30fb568.tar.gz
diff --git a/fetch.sh b/fetch.sh
@@ -1,7 +1,7 @@
#!/bin/sh
URLS="
https://hacktivis.me/releases/utils-std/utils-std-9f43909.tar.gz
- https://frippery.org/make/pdpmake-1.4.2.tgz
+ https://frippery.org/make/pdpmake-2.0.0.tgz
https://gitlab.com/bzip2/bzip2/-/archive/bzip2-1.0.8/bzip2-bzip2-1.0.8.tar.gz
https://zlib.net/zlib-1.3.1.tar.gz
https://www.zlib.net/pigz/pigz-2.8.tar.gz
diff --git a/make-root.sh b/make-root.sh
@@ -8,7 +8,7 @@ tarballs="
loksh-7.5.tar.gz
yacc-oyacc-6.6.tar.gz
utils-std-9f43909.tar.gz
- pdpmake-1.4.2.tgz
+ pdpmake-2.0.0.tgz
nawk-20240422.tar.gz
bzip2-bzip2-1.0.8.tar.gz
zlib-1.3.1.tar.gz
@@ -168,6 +168,12 @@ sed -i \
heirloom-devtools-*/mk.config \
|| die "Failed configuring heirloom-devtools"
+# pdpmake-1.4.3+ consider them invalid "macros"
+sed -i \
+ -e '/^\.c\.o:/s/;/\n\t/' \
+ heirloom-devtools-*/lex/Makefile.mk heirloom-devtools-*/m4/Makefile.mk \
+ || die "Failed patching .c.o: infered targets in heirloom-devtools"
+
# - maninst Fails to create parent dir, just noop it, we don't have man anyway
# -e 's;MANINST =.*;MANINST = $(SHELL) ../build/maninst.sh;' \
# - Turns out tcc comes with an ar(1)
