Skip to content

Commit 5f60a8f

Browse files
committed
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.)
1 parent 33db7ba commit 5f60a8f

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

steps/SHA256SUMS.pkgs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ f650c3b24de6edd49cd662c9e9ce11f7b0b5ea6df66d561b46a032b08fc34faa kbd-1.15_0.tar
6868
36550df491767bb24d2ccab304ce70a3b4956e7c0c0e0c343d922fd57cdafbdd libatomic_ops-7.6.10_0.tar.bz2
6969
b39826742e236890f3562cdf19492e7ef4224b271f3e75ddeab1f07982b03ebe libffi-3.3_0.tar.bz2
7070
daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29 libtool-2.2.4_0.tar.bz2
71-
6cefa575362149620f8008a32c8af54f0198a18bc6ab910bd3cead196c1507d7 libtool-2.4.7_0.tar.bz2
71+
fb534c4c93bdcbe0ad67b19e202bf5fb7efc34adf73c2f81968b814fc99f7426 libtool-2.4.7_0.tar.bz2
7272
503007bbcddcf4e49d26514c59b4c9501f8b42f0c994a59dfdc388b1ae6b7900 libunistring-0.9.10_0.tar.bz2
7373
fd2264a08cbeeb28f3e2580cba174376a154c77b0ef6cbf67b55fd13c0987f52 linux-4.9.10_0.tar.bz2
7474
d15c922973c15a8206e09020e8cfe6a78f7e93614de212f2b37ff80163799c6c linux-headers-4.9.10_0.tar.bz2
@@ -90,7 +90,7 @@ c490016e49bbf77e7f63071f7aa60e8290a0c67f017846def1c3f65bd10d5712 openssl-1.1.1l
9090
b86fc586d72a6d204d0b9017afe17aa2439529e13f43befc56648b78de17c8f8 perl5.004-05_0.tar.bz2
9191
451ae6bb6e996a1c857fe92ec379654413fadec180c6477cf5fd4b5d7a079e26 perl5.005-03_0.tar.bz2
9292
74d64a8af080022432fa94dba449090419d25b103d247710dc0b6102a4ad86a6 perl-5.10.1_0.tar.bz2
93-
fdccd3ba27a44d2149f159040414a04b39bfc72673ba36f50051b61199cc425c perl-5.32.1_0.tar.bz2
93+
71ad3cadba5801cb19d4520825d4b3606713807b1eaa5eb3c49b3149bc2675ad perl-5.32.1_0.tar.bz2
9494
9fa8850897248d77d554caa2b3d52e7890308cbf28750ffc24c09f498aee563c perl-5.6.2_0.tar.bz2
9595
1b9d4260edf7b2241d10e4c4ad17d0f90047bd4bf42f2487a7133902529e9dfe pkg-config-0.29.2_0.tar.bz2
9696
1e882c3206f9d1de2a9be8b5c6ae4cc65e80a4de607bd521058577bf4169c0e9 python-2.0.1_0.tar.bz2

steps/libtool-2.4.7/pass1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ src_configure() {
3535
}
3636

3737
src_compile() {
38-
make "${MAKEJOBS}" AUTOM4TE=autom4te-2.69 MAKEINFO=true
38+
make "${MAKEJOBS}" AUTOM4TE=autom4te-2.69 AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOHEADER=autoheader-2.69 MAKEINFO=true
3939
}
4040

4141
src_install() {

steps/musl-1.1.24/pass3.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ src_compile() {
2828
}
2929

3030
src_install() {
31-
rm -rf "${PREFIX}/include"
3231
make PREFIX="${PREFIX}" DESTDIR="${DESTDIR}" install
3332
}

0 commit comments

Comments
 (0)