From 4016acb143efb3e5dbc5da1f1d0b9ce4e305a83f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Stefanik?= <netrolller.3d@gmail.com>
Date: Thu, 28 Dec 2023 06:56:47 +0100
Subject: [PATCH] Fix checksum inconsistencies between staged and unstaged
 bwrap bootstrap

- libtool needs autoconf (& possibly other autotools) at make time, to
  generate correct & reproducible manpages
- musl-1.1.24 shouldn't nuke /usr/include in its src_install(), as it
  will remove headers used by other packages later, notably perl.
  (Also, touching the live filesystem in src_install() will be skipped
  if the package is preseeded instead, causing inconsistency.)
---
 steps/SHA256SUMS.pkgs        | 4 ++--
 steps/libtool-2.4.7/pass1.sh | 2 +-
 steps/musl-1.1.24/pass3.sh   | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
index 8e9124db..536f12ad 100644
--- a/steps/SHA256SUMS.pkgs
+++ b/steps/SHA256SUMS.pkgs
@@ -68,7 +68,7 @@ f650c3b24de6edd49cd662c9e9ce11f7b0b5ea6df66d561b46a032b08fc34faa  kbd-1.15_0.tar
 36550df491767bb24d2ccab304ce70a3b4956e7c0c0e0c343d922fd57cdafbdd  libatomic_ops-7.6.10_0.tar.bz2
 b39826742e236890f3562cdf19492e7ef4224b271f3e75ddeab1f07982b03ebe  libffi-3.3_0.tar.bz2
 daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29  libtool-2.2.4_0.tar.bz2
-6cefa575362149620f8008a32c8af54f0198a18bc6ab910bd3cead196c1507d7  libtool-2.4.7_0.tar.bz2
+c1577cee0b82534699dc4385ecea9f521516303f773216d00bc30e4bf0053758  libtool-2.4.7_0.tar.bz2
 503007bbcddcf4e49d26514c59b4c9501f8b42f0c994a59dfdc388b1ae6b7900  libunistring-0.9.10_0.tar.bz2
 fd2264a08cbeeb28f3e2580cba174376a154c77b0ef6cbf67b55fd13c0987f52  linux-4.9.10_0.tar.bz2
 d15c922973c15a8206e09020e8cfe6a78f7e93614de212f2b37ff80163799c6c  linux-headers-4.9.10_0.tar.bz2
@@ -90,7 +90,7 @@ c490016e49bbf77e7f63071f7aa60e8290a0c67f017846def1c3f65bd10d5712  openssl-1.1.1l
 b86fc586d72a6d204d0b9017afe17aa2439529e13f43befc56648b78de17c8f8  perl5.004-05_0.tar.bz2
 451ae6bb6e996a1c857fe92ec379654413fadec180c6477cf5fd4b5d7a079e26  perl5.005-03_0.tar.bz2
 74d64a8af080022432fa94dba449090419d25b103d247710dc0b6102a4ad86a6  perl-5.10.1_0.tar.bz2
-fdccd3ba27a44d2149f159040414a04b39bfc72673ba36f50051b61199cc425c  perl-5.32.1_0.tar.bz2
+71ad3cadba5801cb19d4520825d4b3606713807b1eaa5eb3c49b3149bc2675ad  perl-5.32.1_0.tar.bz2
 9fa8850897248d77d554caa2b3d52e7890308cbf28750ffc24c09f498aee563c  perl-5.6.2_0.tar.bz2
 1b9d4260edf7b2241d10e4c4ad17d0f90047bd4bf42f2487a7133902529e9dfe  pkg-config-0.29.2_0.tar.bz2
 1e882c3206f9d1de2a9be8b5c6ae4cc65e80a4de607bd521058577bf4169c0e9  python-2.0.1_0.tar.bz2
diff --git a/steps/libtool-2.4.7/pass1.sh b/steps/libtool-2.4.7/pass1.sh
index 9e34141d..4a27412e 100755
--- a/steps/libtool-2.4.7/pass1.sh
+++ b/steps/libtool-2.4.7/pass1.sh
@@ -35,7 +35,7 @@ src_configure() {
 }
 
 src_compile() {
-    make "${MAKEJOBS}" AUTOM4TE=autom4te-2.69 MAKEINFO=true
+    make "${MAKEJOBS}" AUTOM4TE=autom4te-2.69 AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOHEADER=autoheader-2.69 MAKEINFO=true
 }
 
 src_install() {
diff --git a/steps/musl-1.1.24/pass3.sh b/steps/musl-1.1.24/pass3.sh
index 6a2342db..6f7c1ae2 100755
--- a/steps/musl-1.1.24/pass3.sh
+++ b/steps/musl-1.1.24/pass3.sh
@@ -28,6 +28,5 @@ src_compile() {
 }
 
 src_install() {
-    rm -rf "${PREFIX}/include"
     make PREFIX="${PREFIX}" DESTDIR="${DESTDIR}" install
 }