From 3900cf04ca6ba69d5e5da2aa7b9c6c1f6039e64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 5 Oct 2022 01:33:19 +0100 Subject: [PATCH] Move musl build with shared libraries after autogen. --- sysa/SHA256SUMS.pkgs | 22 +++++++++---------- sysc/autogen-5.18.16/autogen-5.18.16.sh | 1 + sysc/gc-8.0.4/gc-8.0.4.sh | 3 ++- sysc/gperf-3.1/gperf-3.1.sh | 4 ++-- sysc/grep-3.7/grep-3.7.sh | 2 +- .../libatomic_ops-7.6.10.sh | 4 ++-- sysc/libffi-3.3/libffi-3.3.sh | 11 +++++----- .../libunistring-0.9.10.sh | 5 +++-- sysc/run2.sh | 4 ++-- sysc/which-2.21/which-2.21.sh | 2 +- 10 files changed, 31 insertions(+), 27 deletions(-) diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs index 026f9c2..9d2f464 100644 --- a/sysa/SHA256SUMS.pkgs +++ b/sysa/SHA256SUMS.pkgs @@ -12,7 +12,7 @@ d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4 autoconf-2.64_ 298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b autoconf-2.69_0.tar.bz2 d713ac1840e82250414ee4f7cd75c79ee44ecb4e8dfc659704eed3d75e7d348c autoconf-2.71_0.x86.xbps 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b autoconf-archive-2021.02.19_0.tar.bz2 -14c4f0277ece4291347344cc86d8d5a2e67ae9802933b466bc4b181f646418fe autogen-5.18.16_0.x86.xbps +28b6b2b87de17ca51c92610b6949746056169506150a036a107c67b43163d16f autogen-5.18.16_0.x86.xbps fbd8739c8f69b388e2c54893faa1180cc38f2718339da82788312adb0201c5d0 automake-1.10.3_0.tar.bz2 e5eae329b2f6854c18844df70fe13975d3c5394708e274616bc4168e55801b41 automake-1.11.2_0.tar.bz2 732d12fdeea2c234750c8e91c90a90934d279283839cdabe0343fa765ba24168 automake-1.15.1_0.tar.bz2 @@ -49,26 +49,26 @@ f55c11b091361536774b436abe86b17f759cd7a66522cd20c7a2190da92db67a findutils-4.2. 33afd1c66c864b486df290e682883556787c61751b8c851deb2737f0b777ffd6 flex-2.5.33_0.tar.bz2 000147c1a33feff5c5b4cb10c2cf6c2b2f4ef92a90c9e659b25f1766a83d4afc flex-2.6.4_0.tar.bz2 92fe0ffd0971a40fd98c70b075d5bb12f2d8093ef8fb3333aac2b532bd53a591 gawk-3.0.4_0.tar.bz2 -7a35239a2ad2f39220daa888650dbc44ba4a5664856997d2afb6165d305a8f82 gc-8.0.4_0.x86.xbps +0a8d7c32e8a32c7db713cf9d4b75f6ea186771197a425f20334b80072710d896 gc-8.0.4_0.x86.xbps 07715a0c8bc13b80fc10ede20573f92e933b8d3dc6a5c8700f4289965ea8ec74 gcc-4.0.4_0.tar.bz2 e7c678c71c51cd6e8ce6eae029503a661169e6994ba0f988ac15634254d1fadb gcc-4.0.4_1.tar.bz2 edbe2c9ad51858feffe869aae25aec9de99d85fc0566ec883354ddd9e9b5060c gcc-4.7.4_0.x86.xbps f34c959abbf0119b76b58564786887d66e449914c48f4f74fed1cc392bdb7194 gettext-0.21_0.x86.xbps fe16fb6021f1f4650c98f77261145f37732be0aee06e957b0bdb3b01beb593a8 gmp-6.2.1_0.tar.bz2 -8910194c89ee6613dd4bdb20b795299bc7b556365588327631edb86340691436 gperf-3.1_0.x86.xbps +a11a48dd24beda2b94d53df3305dfd9a0fc56d320a8eb9bc69df2d418b60ecf9 gperf-3.1_0.x86.xbps 390840f2bc9c2a3196c28e06f8650f408e33b5d4ffe5539e174682ed13960bc9 grep-2.4_0.tar.bz2 -3b0cbd8049d1a0222c5fe7dec4735edfd54b85c3a8646e8afb746eac2cad73e4 grep-3.7_0.x86.xbps -cb0c913185dbcead7b9657c847dfe88888b2ce565fc117f0c7abe6ff79eb8dd5 guile-3.0.7_0.x86.xbps +aae2bd8b16dcf260255bd670f39d876437085e0fdca196dae3fa164df8bc3790 grep-3.7_0.x86.xbps +b9b42672081a3b1901950495638a875dbe6e2546aa443a55d73ad550d7a3768f guile-3.0.7_0.x86.xbps ec6b32cba3f49f860a3d9b97cea57931869c5849d8ca5ad0ea01dad45b9edb91 help2man-1.36.4_0.tar.bz2 2ef01fe7252be680382bee5df890ad3f6dae26744104ccdaa2d1236bc19ab44a kbd-1.15_0.tar.bz2 68c272b50a99e4d53cab57552337e7660020a47c06a0341efcdfa4f2441db187 kexec-tools-2.0.22_0.tar.bz2 4c0cc86a9855122a4b5c12bff6f6bbf524495910ec718ef339fbfe7076824950 libarchive-3.5.2_0.tar.bz2 -f31b3c1d1d359c145271b5dbda0d541121f508d3da8aaf11f345641c177329d9 libatomic_ops-7.6.10_0.x86.xbps -dfe5b63ff66a6c35f2de98a1430908687a23b22294202e8aa43d21f6de136a3a libffi-3.3_0.x86.xbps +c185d9cc55029fb2fd4f4897b6581c22f0957b57a4fff8f68591c068a4e16daa libatomic_ops-7.6.10_0.x86.xbps +bd17cec1e4d5eabaa474bbe671cc33af71dce8155206221a310a98bdc5f52fd3 libffi-3.3_0.x86.xbps 5001f8fdbba0db0ecf60263bfea97ed4b9174d06a447e98bee220548f973756a libtool-1.4_0.tar.bz2 94d0f9d2f8fbc2b00fe4c0f479e5590fa70b7d856f0a643ad006787d963f99ee libtool-2.2.4_0.tar.bz2 374214711d42681d030d6faceba3198243ec22301d94212f7162bd4873b7ba27 libtool-2.4.7_0.tar.bz2 -8f5b16e20c0ee82b15e4771194ec40ef89a76980b1486d0b31d6d0b5d507822a libunistring-0.9.10_0.x86.xbps +aa5682f17b8f68a5807bf8a11e0ce324ca88ce7e7005e891c1122bbbf77f33a4 libunistring-0.9.10_0.x86.xbps 1d07aaf7049be45853fd409340cdb52bb3a1b6dfa4dbc8b69358c1ee966cd67f linux-4.9.10_0.tar.bz2 61507b58074a3742191b606f9415f79406e5daa693ab4ba4a4543897696628ea linux-headers-5.10.41_0.tar.bz2 5cda10550198e613c426e45c5fffe0f7e8761296e7339e9e9a1f9da995b4865a m4-1.4.7_0.tar.bz2 @@ -80,7 +80,7 @@ ffeadd2b9d9e72edb5b15750b50a6c0c47bb90a1cb14ba66732aa733e0209e50 mpfr-4.1.0_0.t 7f3251ee05aaa38e9803db41104acbfa399873a31591411c3580d181a6461d0c musl-1.1.24_1.tar.bz2 9f3d2b47634860cfd5f03fa3346ef9a60a6dab57164ee974578dbb7f4a45e16b musl-1.1.24_2.tar.bz2 af949ecc98bdc3b94d0f74e5d38a3c3710712a029ddb6cf9b801390e1d626b3c musl-1.2.3_0.tar.bz2 -b6822d7a7184789038b65fa063fd2f1ef2e30fe23ed77b627e96e32cdd8fd594 musl-1.2.3_1.x86.xbps +b41fc4618bef304ec05e3350ea04a7b7698765ce1654692b66e367afc4d45ffc musl-1.2.3_1.x86.xbps df12820e27abfe07c4c27bb2f9abf2e0758b797d5d3036e29d6c57cfb5aa12d6 openssl-1.1.1l_0.tar.bz2 189443aecea6e8435d1243071c2e46d7e4bb8f79f2929ae6a6c96eea40394a35 patch-2.7.6_0.x86.xbps 75fffc4bb14f14281bc1853455888d1d818b7027efc1e4014af1a755771a64e8 perl-5.000_0.tar.bz2 @@ -92,14 +92,14 @@ df12820e27abfe07c4c27bb2f9abf2e0758b797d5d3036e29d6c57cfb5aa12d6 openssl-1.1.1l 041aed738c039a8c437c6d29530fe44f55bd5fc9ac2bb54f793f6fe3a9df16fd perl5.005-03_0.tar.bz2 c69e0197ebc1bf9f9fc68a06d4c649c934784077058c24a484da59a153132816 pkg-config-0.29.2_0.tar.bz2 8a0248fbf8fe1764580698415cc3628585d4dd054ddf63040f400e18cbaef7a4 sed-4.0.9_0.tar.bz2 -af951f34f57d5920ee3b408f64bc8594d88d26cfd9a71ea465a0dba7b10600e8 sed-4.8_0.x86.xbps +4c8dc372ba7ee7e56a6a3847db5203f2a7b3de02e8db5a9167d1cc4d2acb8127 sed-4.8_0.x86.xbps 1245905d8942a10cccf21850a521db19c9a65ab35cef4c6bbb72672773851048 tar-1.34_0.tar.bz2 42b8eabbd299737541b57b3aa362eeeb20499449901fc2a4895302ce0117080c tcc-0.9.27_0.tar.bz2 db57c6ef39965f0562d2aefe3c06571df50ba1265446d97f2714d80518862cef tcc-0.9.27_1.tar.bz2 e2014b844b1a79cda9142a38af0404efd242ae02f77aa286c968e4ad6ad87265 tcc-0.9.27_2.tar.bz2 96dc08f4d01eddc04af107ffd313617af3fc455af38a82b850c4aca08cbd7e84 texinfo-6.7_0.x86.xbps bf4a6be34cda165e4c206e852ccc09387f5ae8ea7db6de2db01297cabfa1a486 util-linux-2.19.1_0.tar.bz2 -7d130a092dc12dcd8fc0ecdbf42c84b64ec11c635b6c70e21bda1e722bf2ea0f which-2.21_0.x86.xbps +d0af5adff5433f4e43c0f0a241297046ebd5529994946e45b0d07854182cf84f which-2.21_0.x86.xbps 3f044d2aaa838c9df153d662f8e259c2393774d3d3a5e71e26b5d867dbb08107 xbps-0.59.1_0.tar.bz2 e900a8b70f49bfcbb7a48bd27e2de67c30454d693b6f35dcdfadd35570e98e69 xz-5.0.5_0.tar.bz2 bb1e34d0392fddf9718e025344af575c1c534fbc61a1e4476e0c7ae2614f57ca zlib-1.2.12_0.tar.bz2 diff --git a/sysc/autogen-5.18.16/autogen-5.18.16.sh b/sysc/autogen-5.18.16/autogen-5.18.16.sh index cb60111..94991c2 100755 --- a/sysc/autogen-5.18.16/autogen-5.18.16.sh +++ b/sysc/autogen-5.18.16/autogen-5.18.16.sh @@ -44,6 +44,7 @@ src_compile() { ./configure \ --prefix="${FINALPREFIX}" \ --libdir="${FINALPREFIX}/lib/musl" \ + --disable-shared \ --enable-timeout=15 touch doc/agdoc.texi # build later make CFLAGS=-Wno-error diff --git a/sysc/gc-8.0.4/gc-8.0.4.sh b/sysc/gc-8.0.4/gc-8.0.4.sh index 8bf8eae..bc80021 100755 --- a/sysc/gc-8.0.4/gc-8.0.4.sh +++ b/sysc/gc-8.0.4/gc-8.0.4.sh @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas +# SPDX-FileCopyrightText: 2021 Andrius Štikonas # # SPDX-License-Identifier: GPL-3.0-or-later @@ -11,5 +11,6 @@ src_configure() { ./configure \ --prefix="${PREFIX}" \ --libdir="${PREFIX}/lib/musl" \ + --disable-shared \ CFLAGS='-D_GNU_SOURCE -DNO_GETCONTEXT -DSEARCH_FOR_DATA_START -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR' } diff --git a/sysc/gperf-3.1/gperf-3.1.sh b/sysc/gperf-3.1/gperf-3.1.sh index 9695125..24144b5 100755 --- a/sysc/gperf-3.1/gperf-3.1.sh +++ b/sysc/gperf-3.1/gperf-3.1.sh @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas +# SPDX-FileCopyrightText: 2021 Andrius Štikonas # # SPDX-License-Identifier: GPL-3.0-or-later @@ -15,5 +15,5 @@ src_prepare() { } src_configure() { - LDFLAGS="-static" ./configure --prefix="${PREFIX}" + ./configure --prefix="${PREFIX}" } diff --git a/sysc/grep-3.7/grep-3.7.sh b/sysc/grep-3.7/grep-3.7.sh index e70ca36..8f317f4 100755 --- a/sysc/grep-3.7/grep-3.7.sh +++ b/sysc/grep-3.7/grep-3.7.sh @@ -15,7 +15,7 @@ src_prepare() { } src_configure() { - LDFLAGS="-static" ./configure --prefix="${PREFIX}" + ./configure --prefix="${PREFIX}" } src_install() { diff --git a/sysc/libatomic_ops-7.6.10/libatomic_ops-7.6.10.sh b/sysc/libatomic_ops-7.6.10/libatomic_ops-7.6.10.sh index 4d44ef8..1387d8c 100755 --- a/sysc/libatomic_ops-7.6.10/libatomic_ops-7.6.10.sh +++ b/sysc/libatomic_ops-7.6.10/libatomic_ops-7.6.10.sh @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Andrius Štikonas +# SPDX-FileCopyrightText: 2021 Andrius Štikonas # # SPDX-License-Identifier: GPL-3.0-or-later @@ -10,5 +10,5 @@ src_configure() { ./configure \ --prefix="${PREFIX}" \ --libdir="${PREFIX}/lib/musl" \ - --enable-shared + --disable-shared } diff --git a/sysc/libffi-3.3/libffi-3.3.sh b/sysc/libffi-3.3/libffi-3.3.sh index 32b6aae..39b4db5 100755 --- a/sysc/libffi-3.3/libffi-3.3.sh +++ b/sysc/libffi-3.3/libffi-3.3.sh @@ -10,9 +10,10 @@ src_prepare() { src_configure() { ./configure \ - --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ - --build=i386-unknown-linux-musl \ - --with-gcc-arch=generic \ - --enable-pax_emutramp + --prefix="${PREFIX}" \ + --libdir="${PREFIX}/lib/musl" \ + --build=i386-unknown-linux-musl \ + --disable-shared \ + --with-gcc-arch=generic \ + --enable-pax_emutramp } diff --git a/sysc/libunistring-0.9.10/libunistring-0.9.10.sh b/sysc/libunistring-0.9.10/libunistring-0.9.10.sh index 8cc27a5..2e20825 100755 --- a/sysc/libunistring-0.9.10/libunistring-0.9.10.sh +++ b/sysc/libunistring-0.9.10/libunistring-0.9.10.sh @@ -15,6 +15,7 @@ src_prepare() { src_configure() { ./configure \ - --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" + --prefix="${PREFIX}" \ + --libdir="${PREFIX}/lib/musl" \ + --disable-shared } diff --git a/sysc/run2.sh b/sysc/run2.sh index d379fc1..2983fe1 100755 --- a/sysc/run2.sh +++ b/sysc/run2.sh @@ -84,8 +84,6 @@ build gcc-4.7.4 build binutils-2.38 -build musl-1.2.3 - build gperf-3.1 build libunistring-0.9.10 @@ -106,6 +104,8 @@ build sed-4.8 build autogen-5.18.16 autogen-5.18.16.sh '' gnu-autogen-bootstrapping-autogen-5.18.16-v1.0 +build musl-1.2.3 + if [ "$FORCE_TIMESTAMPS" = True ] ; then echo 'Forcing all files timestamps to be 0 unix time.' canonicalise_all_files_timestamp diff --git a/sysc/which-2.21/which-2.21.sh b/sysc/which-2.21/which-2.21.sh index 168beca..6e89cdc 100755 --- a/sysc/which-2.21/which-2.21.sh +++ b/sysc/which-2.21/which-2.21.sh @@ -12,7 +12,7 @@ src_prepare() { } src_configure() { - LDFLAGS="-static" ./configure --prefix="${PREFIX}" + ./configure --prefix="${PREFIX}" } src_install() {