From 8208831e5af490e703997b3e99c0902b46e6e988 Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Wed, 14 Sep 2022 18:30:33 +0300 Subject: [PATCH 1/4] Set --libdir when configuring dhcpcd 9.4.1 --- sysa/SHA256SUMS.pkgs | 2 +- sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs index 6074bdc..d522a85 100644 --- a/sysa/SHA256SUMS.pkgs +++ b/sysa/SHA256SUMS.pkgs @@ -39,7 +39,7 @@ c4d59e759f7349b96f74e62d867e419f3d85fbb81eaf5f79f996abf48f0d3170 coreutils-5.0_ b8992f675350658b106c3066cac0ee31440020bc9d6128bfc2fdf1fde60efd74 coreutils-8.32_0.tar.bz2 28a1e93ed14f7fa4d3c8ca41e9b78e29ba685fbc8b6bf7ba3b6933770d68eedb curl-7.83.0_0.tar.bz2 7587f57c2dbfd67c568dbf91774676a8e250eadc93764bc74b902f61253e97c4 curl-7.83.0_1.tar.bz2 -a6f8f4db6bf449ed8771efefabb88833f1fc5f314d565b7714c9c8b4ba34b20c dhcpcd-9.4.1_0.tar.bz2 +0f0537eac71787a4da8b39152be9a0d4eba98fd61b7387a7d777fb325552bc96 dhcpcd-9.4.1_0.tar.bz2 ca91a67d5d0c0ee46d064d9bf7c26efcafe712a9f86866991028478df3b34f21 diffutils-2.7_0.tar.bz2 de6d9df33107ae63b8e0f30902fe9d00e42f78f44a60b256bb0b3c82ff75bd45 dist-3.5-236_0.tar.bz2 9ed3eb8e598317d00c0f9467c956abdc5857542b699095fcc9e80c3e2d0bfc04 e2fsprogs-1.45.7_0.tar.bz2 diff --git a/sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh b/sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh index d0611d4..2df180d 100755 --- a/sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh +++ b/sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh @@ -11,6 +11,7 @@ src_prepare() { src_configure() { CC=gcc ./configure \ --prefix="${PREFIX}" \ + --libdir="${PREFIX}/lib/musl" \ --sbindir="${PREFIX}/bin" \ --disable-embedded \ --disable-auth From 916541707a54b02a27e296ba4aa71aa5c4814933 Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Wed, 14 Sep 2022 18:31:14 +0300 Subject: [PATCH 2/4] Set --libdir when configuring bison 2.3 --- sysa/SHA256SUMS.pkgs | 2 +- sysc/bison-2.3/bison-2.3.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs index d522a85..74ebf40 100644 --- a/sysa/SHA256SUMS.pkgs +++ b/sysa/SHA256SUMS.pkgs @@ -27,7 +27,7 @@ b2eab85c4a22060cc18945f6cb24cdf928fee370fff3fe12482e866a1cace586 automake-1.6.3 e180c61e3922b0546a6a3ee498abeba6dfdd404215ca850628a5277e5ede26e7 bash-5.1_0.tar.bz2 a6190872c4daf1b55a1ad1f2fd2e34bd251f3808f750bb4a7920b66d672497a8 binutils-2.14_0.tar.bz2 6f8387ec292b5b57f3722828094630714e117d99e9924ffd4bee40600a74b69f binutils-2.38_0.x86.xbps -f566a5cb99adc8f572659ebf4a778ff23acf62d90b13a9983f56488a493b15b2 bison-2.3_0.tar.bz2 +e90a754c0072e3660ab209b7255868bee2e8e07611bfbdfb742697100345331d bison-2.3_0.tar.bz2 87dae598915deabe95a4ee75ec6cfed3a6e6da1a655c3ad90ee60ec07a7d87fa bison-3.4.1_0.tar.bz2 ae452f08ad9f7ab01f2a9bd882170e71ee6200a06f044f4aadb446cc68700016 bison-3.4.1_1.tar.bz2 becc8ea1f24c531c35b520ce8bac9e8bf6e30e362fe77bf7833aed9d28af0ae6 bison-3.4.1_2.tar.bz2 diff --git a/sysc/bison-2.3/bison-2.3.sh b/sysc/bison-2.3/bison-2.3.sh index 10776f5..7f4ba51 100755 --- a/sysc/bison-2.3/bison-2.3.sh +++ b/sysc/bison-2.3/bison-2.3.sh @@ -23,6 +23,7 @@ src_prepare() { src_configure() { LEX=flex-2.5.33 ./configure \ --prefix="${PREFIX}" \ + --libdir="${PREFIX}/lib/musl" \ --program-suffix=-2.3 \ --datarootdir="${PREFIX}/share/bison-2.3" } From 3e3f7036f28835d95670f1381310c1bde3d1174a Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Wed, 14 Sep 2022 18:31:50 +0300 Subject: [PATCH 3/4] Set --libdir when configuring curl 7.83.0 --- sysa/SHA256SUMS.pkgs | 4 ++-- sysa/curl-7.83.0/curl-7.83.0.sh | 1 + sysc/curl-7.83.0/curl-7.83.0.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs index 74ebf40..f3f92b2 100644 --- a/sysa/SHA256SUMS.pkgs +++ b/sysa/SHA256SUMS.pkgs @@ -37,8 +37,8 @@ c484b98e580d7ef5619dc2da2318d9f1e69360a882f64aa15e0fdde0184c45fb ca-certificate c4d59e759f7349b96f74e62d867e419f3d85fbb81eaf5f79f996abf48f0d3170 coreutils-5.0_0.tar.bz2 776ef3e13870fba6fc9cec64eaf40fb658abecc99c65724968013f8f8a177802 coreutils-6.10_0.tar.bz2 b8992f675350658b106c3066cac0ee31440020bc9d6128bfc2fdf1fde60efd74 coreutils-8.32_0.tar.bz2 -28a1e93ed14f7fa4d3c8ca41e9b78e29ba685fbc8b6bf7ba3b6933770d68eedb curl-7.83.0_0.tar.bz2 -7587f57c2dbfd67c568dbf91774676a8e250eadc93764bc74b902f61253e97c4 curl-7.83.0_1.tar.bz2 +f7235472f31fec1a12efb5c98a1f3c2df86b1386aac90f4db0b2a162fc5aabbf curl-7.83.0_0.tar.bz2 +88d67e89e35104424d58f76669c39e2d0d1377fa26be9598f28f7ea8ccd773f2 curl-7.83.0_1.tar.bz2 0f0537eac71787a4da8b39152be9a0d4eba98fd61b7387a7d777fb325552bc96 dhcpcd-9.4.1_0.tar.bz2 ca91a67d5d0c0ee46d064d9bf7c26efcafe712a9f86866991028478df3b34f21 diffutils-2.7_0.tar.bz2 de6d9df33107ae63b8e0f30902fe9d00e42f78f44a60b256bb0b3c82ff75bd45 dist-3.5-236_0.tar.bz2 diff --git a/sysa/curl-7.83.0/curl-7.83.0.sh b/sysa/curl-7.83.0/curl-7.83.0.sh index 950ee01..7001e74 100755 --- a/sysa/curl-7.83.0/curl-7.83.0.sh +++ b/sysa/curl-7.83.0/curl-7.83.0.sh @@ -21,6 +21,7 @@ src_prepare() { src_configure() { LDFLAGS="-static" ./configure \ --prefix="${PREFIX}" \ + --libdir="${PREFIX}/lib/musl" \ --build=i386-unknown-linux-gnu \ --without-ssl \ --disable-hsts diff --git a/sysc/curl-7.83.0/curl-7.83.0.sh b/sysc/curl-7.83.0/curl-7.83.0.sh index 7742f97..35df84f 100755 --- a/sysc/curl-7.83.0/curl-7.83.0.sh +++ b/sysc/curl-7.83.0/curl-7.83.0.sh @@ -23,6 +23,7 @@ src_prepare() { src_configure() { LDFLAGS="-static" ./configure \ --prefix="${PREFIX}" \ + --libdir="${PREFIX}/lib/musl" \ --with-openssl \ --with-ca-bundle=/etc/ssl/certs.pem \ --build=i386-unknown-linux-musl From 9d84539a70e5140bb1519230e6c3d6836f3dcd4a Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Wed, 14 Sep 2022 18:32:09 +0300 Subject: [PATCH 4/4] Set --libdir when configuring gettext 0.21 --- sysa/SHA256SUMS.pkgs | 2 +- sysc/gettext-0.21/gettext-0.21.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs index f3f92b2..900254f 100644 --- a/sysa/SHA256SUMS.pkgs +++ b/sysa/SHA256SUMS.pkgs @@ -52,7 +52,7 @@ f55c11b091361536774b436abe86b17f759cd7a66522cd20c7a2190da92db67a findutils-4.2. 07715a0c8bc13b80fc10ede20573f92e933b8d3dc6a5c8700f4289965ea8ec74 gcc-4.0.4_0.tar.bz2 e7c678c71c51cd6e8ce6eae029503a661169e6994ba0f988ac15634254d1fadb gcc-4.0.4_1.tar.bz2 edbe2c9ad51858feffe869aae25aec9de99d85fc0566ec883354ddd9e9b5060c gcc-4.7.4_0.x86.xbps -b5f6fe07a696751d2fc1d9cc3d96f09d89d6a637e1d8d0b250105b650e831600 gettext-0.21_0.x86.xbps +f34c959abbf0119b76b58564786887d66e449914c48f4f74fed1cc392bdb7194 gettext-0.21_0.x86.xbps fe16fb6021f1f4650c98f77261145f37732be0aee06e957b0bdb3b01beb593a8 gmp-6.2.1_0.tar.bz2 73742c85954e9899ef76385698b791664a542ab0b580ae2d789445c683af509b gperf-3.1_0.x86.xbps 390840f2bc9c2a3196c28e06f8650f408e33b5d4ffe5539e174682ed13960bc9 grep-2.4_0.tar.bz2 diff --git a/sysc/gettext-0.21/gettext-0.21.sh b/sysc/gettext-0.21/gettext-0.21.sh index 4ac8c2c..6eb998c 100755 --- a/sysc/gettext-0.21/gettext-0.21.sh +++ b/sysc/gettext-0.21/gettext-0.21.sh @@ -20,7 +20,7 @@ src_prepare() { } src_configure() { - ./configure --prefix="${PREFIX}" --enable-static --disable-shared --disable-java + ./configure --prefix="${PREFIX}" --libdir="${PREFIX}/lib/musl" --enable-static --disable-shared --disable-java } src_compile() {