From 59a13f0d09925b8be962583c38a6897ba19337f7 Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Wed, 14 Sep 2022 15:07:13 +0300 Subject: [PATCH] Add LIBDIR variable for the musl library directory LIBDIR should be used where possible to avoid unnecessary duplication in build scripts that target the musl toolchain. No change in package hashes. --- sysa/binutils-2.14/binutils-2.14.sh | 2 +- sysa/curl-7.83.0/curl-7.83.0.sh | 2 +- sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh | 2 +- sysa/gcc-4.0.4/pass1.sh | 10 +++++----- sysa/gcc-4.0.4/pass2.sh | 6 +++--- sysa/libtool-1.4/libtool-1.4.sh | 2 +- sysa/libtool-2.2.4/libtool-2.2.4.sh | 2 +- sysa/musl-1.1.24/binutils-rebuild.sh | 2 +- sysa/musl-1.1.24/musl-1.1.24.sh | 2 +- sysa/musl-1.2.3/musl-1.2.3.sh | 2 +- sysa/run.sh | 2 ++ sysa/tcc-0.9.27/tcc-musl-pass1.sh | 2 +- sysa/tcc-0.9.27/tcc-musl-pass2.sh | 2 +- sysa/tcc-0.9.27/tcc-musl-pass3.sh | 2 +- sysa/util-linux-2.19.1/util-linux-2.19.1.sh | 2 +- sysc/autogen-5.18.16/autogen-5.18.16.sh | 2 +- sysc/binutils-2.38/binutils-2.38.sh | 2 +- sysc/bison-2.3/bison-2.3.sh | 2 +- sysc/bison-3.4.2/bison-3.4.2.sh | 2 +- sysc/curl-7.83.0/curl-7.83.0.sh | 2 +- sysc/flex-2.5.33/flex-2.5.33.sh | 2 +- sysc/gc-8.0.4/gc-8.0.4.sh | 2 +- sysc/gcc-4.7.4/gcc-4.7.4.sh | 12 ++++++------ sysc/gettext-0.21/gettext-0.21.sh | 2 +- sysc/gmp-6.2.1/gmp-6.2.1.sh | 2 +- sysc/guile-3.0.7/guile-3.0.7.sh | 4 ++-- sysc/init | 2 ++ sysc/libarchive-3.5.2/libarchive-3.5.2.sh | 2 +- sysc/libatomic_ops-7.6.10/libatomic_ops-7.6.10.sh | 2 +- sysc/libffi-3.3/libffi-3.3.sh | 2 +- sysc/libtool-2.4.7/libtool-2.4.7.sh | 2 +- sysc/libunistring-0.9.10/libunistring-0.9.10.sh | 2 +- sysc/mpc-1.2.1/mpc-1.2.1.sh | 2 +- sysc/mpfr-4.1.0/mpfr-4.1.0.sh | 2 +- sysc/musl-1.2.3/musl-1.2.3.sh | 4 ++-- sysc/openssl-1.1.1l/openssl-1.1.1l.sh | 2 +- sysc/python-2.0.1/stage1.sh | 2 +- sysc/python-2.0.1/stage2.sh | 2 +- sysc/python-2.3.7/stage1.sh | 2 +- sysc/python-2.3.7/stage2.sh | 2 +- sysc/python-2.5.6/python-2.5.6.sh | 4 ++-- sysc/python-3.1.5/stage1.sh | 6 +++--- sysc/python-3.1.5/stage2.sh | 6 +++--- sysc/python-3.11.1/python-3.11.1.sh | 6 +++--- sysc/python-3.3.7/python-3.3.7.sh | 6 +++--- sysc/python-3.4.10/python-3.4.10.sh | 6 +++--- sysc/python-3.8.16/python-3.8.16.sh | 6 +++--- sysc/xz-5.0.5/xz-5.0.5.sh | 2 +- sysc/zlib-1.2.13/zlib-1.2.13.sh | 2 +- 49 files changed, 77 insertions(+), 73 deletions(-) diff --git a/sysa/binutils-2.14/binutils-2.14.sh b/sysa/binutils-2.14/binutils-2.14.sh index 69e3171a..2983d303 100755 --- a/sysa/binutils-2.14/binutils-2.14.sh +++ b/sysa/binutils-2.14/binutils-2.14.sh @@ -122,7 +122,7 @@ src_configure() { --with-sysroot="${PREFIX}" \ --disable-64-bit-bfd \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --srcdir=. cd .. done 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 5942ccb4..9e7261ce 100755 --- a/sysa/curl-7.83.0/curl-7.83.0.sh +++ b/sysa/curl-7.83.0/curl-7.83.0.sh @@ -21,7 +21,7 @@ src_prepare() { src_configure() { LDFLAGS="-static" ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-gnu \ --enable-ipv6 \ --without-ssl \ 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 2df180d0..232705ab 100755 --- a/sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh +++ b/sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh @@ -11,7 +11,7 @@ src_prepare() { src_configure() { CC=gcc ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --sbindir="${PREFIX}/bin" \ --disable-embedded \ --disable-auth diff --git a/sysa/gcc-4.0.4/pass1.sh b/sysa/gcc-4.0.4/pass1.sh index 46e6852e..872398cb 100755 --- a/sysa/gcc-4.0.4/pass1.sh +++ b/sysa/gcc-4.0.4/pass1.sh @@ -74,7 +74,7 @@ src_configure() { cd $dir CC=tcc CFLAGS="-D HAVE_ALLOCA_H" ../../$dir/configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}"/lib/musl \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-musl \ --target=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ @@ -98,9 +98,9 @@ src_compile() { } src_install() { - mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include" + mkdir -p "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include" make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" - mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include" - rm "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h" - cp gcc/gsyslimits.h "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h" + mkdir -p "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.0.4/include" + rm "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h" + cp gcc/gsyslimits.h "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h" } diff --git a/sysa/gcc-4.0.4/pass2.sh b/sysa/gcc-4.0.4/pass2.sh index dc564dc6..49d3e784 100755 --- a/sysa/gcc-4.0.4/pass2.sh +++ b/sysa/gcc-4.0.4/pass2.sh @@ -73,7 +73,7 @@ src_configure() { cd $dir ../../$dir/configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}"/lib/musl \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-musl \ --target=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ @@ -92,7 +92,7 @@ src_compile() { } src_install() { - mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include" + mkdir -p "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include" make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" - cp gcc/gsyslimits.h "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h" + cp gcc/gsyslimits.h "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h" } diff --git a/sysa/libtool-1.4/libtool-1.4.sh b/sysa/libtool-1.4/libtool-1.4.sh index c387dcf4..9e1ee605 100755 --- a/sysa/libtool-1.4/libtool-1.4.sh +++ b/sysa/libtool-1.4/libtool-1.4.sh @@ -13,7 +13,7 @@ src_prepare() { src_configure() { CC=tcc LD=true AR="tcc -ar" ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --disable-shared \ --host=i386-unknown-linux \ --target=i386-unknown-linux \ diff --git a/sysa/libtool-2.2.4/libtool-2.2.4.sh b/sysa/libtool-2.2.4/libtool-2.2.4.sh index 9a05efd3..4ab44745 100755 --- a/sysa/libtool-2.2.4/libtool-2.2.4.sh +++ b/sysa/libtool-2.2.4/libtool-2.2.4.sh @@ -16,7 +16,7 @@ src_prepare() { src_configure() { CC=tcc ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --disable-shared \ --host=i386-unknown-linux \ --target=i386-unknown-linux \ diff --git a/sysa/musl-1.1.24/binutils-rebuild.sh b/sysa/musl-1.1.24/binutils-rebuild.sh index 4bb705ae..b0700bf4 100755 --- a/sysa/musl-1.1.24/binutils-rebuild.sh +++ b/sysa/musl-1.1.24/binutils-rebuild.sh @@ -14,7 +14,7 @@ src_configure() { --host=i386 \ --disable-shared \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --includedir="${PREFIX}/include/" # configure script creates this file diff --git a/sysa/musl-1.1.24/musl-1.1.24.sh b/sysa/musl-1.1.24/musl-1.1.24.sh index c9467ac8..be498d0f 100755 --- a/sysa/musl-1.1.24/musl-1.1.24.sh +++ b/sysa/musl-1.1.24/musl-1.1.24.sh @@ -17,7 +17,7 @@ src_configure() { --host=i386 \ --disable-shared \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl/" \ + --libdir="${LIBDIR}" \ --includedir="${PREFIX}/include/musl" # configure script creates this file diff --git a/sysa/musl-1.2.3/musl-1.2.3.sh b/sysa/musl-1.2.3/musl-1.2.3.sh index cd73d2a5..330b75ad 100755 --- a/sysa/musl-1.2.3/musl-1.2.3.sh +++ b/sysa/musl-1.2.3/musl-1.2.3.sh @@ -7,7 +7,7 @@ src_configure() { --host=i386-unknown-linux-musl \ --disable-shared \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --includedir="${PREFIX}/include/" # configure script creates this file diff --git a/sysa/run.sh b/sysa/run.sh index a9fca781..ba1e9a85 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -10,6 +10,8 @@ set -e # shellcheck disable=SC2154 PREFIX="${prefix}" +# shellcheck disable=SC2034 +LIBDIR="${prefix}/lib/musl" # shellcheck disable=SC2154 SOURCES="${sysa}" DISTFILES="${sysa}/distfiles" diff --git a/sysa/tcc-0.9.27/tcc-musl-pass1.sh b/sysa/tcc-0.9.27/tcc-musl-pass1.sh index d03acd11..6211138e 100755 --- a/sysa/tcc-0.9.27/tcc-musl-pass1.sh +++ b/sysa/tcc-0.9.27/tcc-musl-pass1.sh @@ -10,7 +10,7 @@ src_prepare() { } src_compile() { - export libdir=${PREFIX}/lib/musl + export libdir=${LIBDIR} export incdir=${PREFIX}/include/musl export bindir=${PREFIX}/bin diff --git a/sysa/tcc-0.9.27/tcc-musl-pass2.sh b/sysa/tcc-0.9.27/tcc-musl-pass2.sh index f2e5fa1d..a5bfecea 100755 --- a/sysa/tcc-0.9.27/tcc-musl-pass2.sh +++ b/sysa/tcc-0.9.27/tcc-musl-pass2.sh @@ -10,7 +10,7 @@ src_prepare() { } src_compile() { - export libdir=${PREFIX}/lib/musl + export libdir=${LIBDIR} export incdir=${PREFIX}/include/musl export bindir=${PREFIX}/bin diff --git a/sysa/tcc-0.9.27/tcc-musl-pass3.sh b/sysa/tcc-0.9.27/tcc-musl-pass3.sh index 7301f3b2..f43ad776 100755 --- a/sysa/tcc-0.9.27/tcc-musl-pass3.sh +++ b/sysa/tcc-0.9.27/tcc-musl-pass3.sh @@ -10,7 +10,7 @@ src_prepare() { } src_compile() { - export libdir=${PREFIX}/lib/musl + export libdir=${LIBDIR} export incdir=${PREFIX}/include export bindir=${PREFIX}/bin diff --git a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh index 8e7bd722..b042a12e 100755 --- a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh +++ b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh @@ -13,7 +13,7 @@ src_configure() { ./configure --prefix="${PREFIX}" \ --bindir="${PREFIX}/bin" \ --sbindir="${PREFIX}/bin" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-gnu \ --disable-libuuid \ --without-ncurses \ 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 94991c2a..80babc83 100755 --- a/sysc/autogen-5.18.16/autogen-5.18.16.sh +++ b/sysc/autogen-5.18.16/autogen-5.18.16.sh @@ -15,7 +15,7 @@ src_prepare() { src_compile() { ( set -e - export PKG_CONFIG_PATH="${PREFIX}/lib/musl/pkgconfig" + export PKG_CONFIG_PATH="${LIBDIR}/pkgconfig" sed -i "s/make install/make install DESTDIR=\${DESTDIR}/" bootstrap_tarball.sh sed -i "/make check/d" bootstrap_tarball.sh export FINALPREFIX="${PREFIX}" diff --git a/sysc/binutils-2.38/binutils-2.38.sh b/sysc/binutils-2.38/binutils-2.38.sh index beb34b07..16fd39e0 100755 --- a/sysc/binutils-2.38/binutils-2.38.sh +++ b/sysc/binutils-2.38/binutils-2.38.sh @@ -75,7 +75,7 @@ src_configure() { --program-prefix="" \ --with-sysroot="${PREFIX}" \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --srcdir=. cd .. done diff --git a/sysc/bison-2.3/bison-2.3.sh b/sysc/bison-2.3/bison-2.3.sh index ed75baa9..98e76fe1 100755 --- a/sysc/bison-2.3/bison-2.3.sh +++ b/sysc/bison-2.3/bison-2.3.sh @@ -20,7 +20,7 @@ src_prepare() { src_configure() { LEX=flex-2.5.33 ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --program-suffix=-2.3 \ --datarootdir="${PREFIX}/share/bison-2.3" } diff --git a/sysc/bison-3.4.2/bison-3.4.2.sh b/sysc/bison-3.4.2/bison-3.4.2.sh index 1fc22671..8a598a43 100755 --- a/sysc/bison-3.4.2/bison-3.4.2.sh +++ b/sysc/bison-3.4.2/bison-3.4.2.sh @@ -22,7 +22,7 @@ src_prepare() { src_configure() { ./configure --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --disable-nls } 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 59f2fe74..60196548 100755 --- a/sysc/curl-7.83.0/curl-7.83.0.sh +++ b/sysc/curl-7.83.0/curl-7.83.0.sh @@ -21,7 +21,7 @@ src_prepare() { src_configure() { LDFLAGS="-static" ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --enable-ipv6 \ --with-openssl \ --with-ca-bundle=/etc/ssl/certs.pem \ diff --git a/sysc/flex-2.5.33/flex-2.5.33.sh b/sysc/flex-2.5.33/flex-2.5.33.sh index b9accf6e..c1dd0efe 100755 --- a/sysc/flex-2.5.33/flex-2.5.33.sh +++ b/sysc/flex-2.5.33/flex-2.5.33.sh @@ -17,7 +17,7 @@ src_prepare() { src_configure() { ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --program-suffix=-2.5.33 } 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 bc800212..3a5c9221 100755 --- a/sysc/gc-8.0.4/gc-8.0.4.sh +++ b/sysc/gc-8.0.4/gc-8.0.4.sh @@ -10,7 +10,7 @@ src_configure() { # CFLAGS needed on musl ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --disable-shared \ CFLAGS='-D_GNU_SOURCE -DNO_GETCONTEXT -DSEARCH_FOR_DATA_START -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR' } diff --git a/sysc/gcc-4.7.4/gcc-4.7.4.sh b/sysc/gcc-4.7.4/gcc-4.7.4.sh index f26b6b29..c7435ddb 100755 --- a/sysc/gcc-4.7.4/gcc-4.7.4.sh +++ b/sysc/gcc-4.7.4/gcc-4.7.4.sh @@ -97,7 +97,7 @@ src_configure() { cd $dir ../../$dir/configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}"/lib/musl \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-musl \ --target=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ @@ -131,11 +131,11 @@ src_install() { make -C build/libgcc install DESTDIR="${DESTDIR}" host_subdir=build make -C build/libstdc++-v3 install DESTDIR="${DESTDIR}" ln -s gcc "${DESTDIR}${PREFIX}/bin/cc" - cp gcc/gsyslimits.h "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/syslimits.h" + cp gcc/gsyslimits.h "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.7.4/include/syslimits.h" # Very strange mis-versoning error - mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/" - mv "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/"* "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/" - rmdir "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include" - mv "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/"* "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/" + mkdir -p "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.7.4/include/" + mv "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.0.4/include/"* "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.7.4/include/" + rmdir "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.0.4/include" + mv "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.0.4/"* "${DESTDIR}${LIBDIR}/gcc/i386-unknown-linux-musl/4.7.4/" } diff --git a/sysc/gettext-0.21/gettext-0.21.sh b/sysc/gettext-0.21/gettext-0.21.sh index d18a0c91..000bc767 100755 --- a/sysc/gettext-0.21/gettext-0.21.sh +++ b/sysc/gettext-0.21/gettext-0.21.sh @@ -17,7 +17,7 @@ src_prepare() { } src_configure() { - ./configure --prefix="${PREFIX}" --libdir="${PREFIX}/lib/musl" --enable-static --disable-shared --disable-java + ./configure --prefix="${PREFIX}" --libdir="${LIBDIR}" --enable-static --disable-shared --disable-java } src_compile() { diff --git a/sysc/gmp-6.2.1/gmp-6.2.1.sh b/sysc/gmp-6.2.1/gmp-6.2.1.sh index afb3d2a3..83b9a063 100755 --- a/sysc/gmp-6.2.1/gmp-6.2.1.sh +++ b/sysc/gmp-6.2.1/gmp-6.2.1.sh @@ -17,7 +17,7 @@ src_prepare() { src_configure() { ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-musl \ --disable-shared } diff --git a/sysc/guile-3.0.7/guile-3.0.7.sh b/sysc/guile-3.0.7/guile-3.0.7.sh index 08c838f7..053c04c5 100755 --- a/sysc/guile-3.0.7/guile-3.0.7.sh +++ b/sysc/guile-3.0.7/guile-3.0.7.sh @@ -31,9 +31,9 @@ src_prepare() { } src_configure() { - PKG_CONFIG_PATH="${PREFIX}/lib/musl/pkgconfig" ./configure \ + PKG_CONFIG_PATH="${LIBDIR}/pkgconfig" ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-musl \ --disable-shared \ --disable-jit diff --git a/sysc/init b/sysc/init index 6f76f763..51d16865 100755 --- a/sysc/init +++ b/sysc/init @@ -8,6 +8,7 @@ set -e PREFIX=/usr +LIBDIR="${PREFIX}/lib/musl" SOURCES="${PREFIX}/src" DESTDIR=/tmp/destdir DISTFILES=/distfiles @@ -65,6 +66,7 @@ cd "${SOURCES}" echo "PREFIX=${PREFIX}" > .env # shellcheck disable=SC2129 +echo "LIBDIR=${LIBDIR}" >> .env echo "SOURCES=${SOURCES}" >> .env echo "DESTDIR=${DESTDIR}" >> .env echo "DISTFILES=${DISTFILES}" >> .env diff --git a/sysc/libarchive-3.5.2/libarchive-3.5.2.sh b/sysc/libarchive-3.5.2/libarchive-3.5.2.sh index 7f757e4d..6d9137c7 100755 --- a/sysc/libarchive-3.5.2/libarchive-3.5.2.sh +++ b/sysc/libarchive-3.5.2/libarchive-3.5.2.sh @@ -9,7 +9,7 @@ src_prepare() { } src_configure() { - ./configure --prefix="${PREFIX}" --libdir="${PREFIX}/lib/musl" \ + ./configure --prefix="${PREFIX}" --libdir="${LIBDIR}" \ --disable-shared } 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 1387d8ca..ad4fb5bf 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 @@ -9,6 +9,6 @@ src_prepare() { src_configure() { ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --disable-shared } diff --git a/sysc/libffi-3.3/libffi-3.3.sh b/sysc/libffi-3.3/libffi-3.3.sh index 39b4db5d..685e4827 100755 --- a/sysc/libffi-3.3/libffi-3.3.sh +++ b/sysc/libffi-3.3/libffi-3.3.sh @@ -11,7 +11,7 @@ src_prepare() { src_configure() { ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-musl \ --disable-shared \ --with-gcc-arch=generic \ diff --git a/sysc/libtool-2.4.7/libtool-2.4.7.sh b/sysc/libtool-2.4.7/libtool-2.4.7.sh index 901b59dc..7cba3b06 100755 --- a/sysc/libtool-2.4.7/libtool-2.4.7.sh +++ b/sysc/libtool-2.4.7/libtool-2.4.7.sh @@ -23,7 +23,7 @@ src_prepare() { src_configure() { ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --disable-shared \ --host=i386-unknown-linux \ --target=i386-unknown-linux \ 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 2e208250..6a28c65b 100755 --- a/sysc/libunistring-0.9.10/libunistring-0.9.10.sh +++ b/sysc/libunistring-0.9.10/libunistring-0.9.10.sh @@ -16,6 +16,6 @@ src_prepare() { src_configure() { ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --disable-shared } diff --git a/sysc/mpc-1.2.1/mpc-1.2.1.sh b/sysc/mpc-1.2.1/mpc-1.2.1.sh index 45d02a2e..24d5fa5b 100755 --- a/sysc/mpc-1.2.1/mpc-1.2.1.sh +++ b/sysc/mpc-1.2.1/mpc-1.2.1.sh @@ -12,7 +12,7 @@ src_prepare() { src_configure() { ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --disable-shared } diff --git a/sysc/mpfr-4.1.0/mpfr-4.1.0.sh b/sysc/mpfr-4.1.0/mpfr-4.1.0.sh index 5f3f0c3d..ab76de0b 100755 --- a/sysc/mpfr-4.1.0/mpfr-4.1.0.sh +++ b/sysc/mpfr-4.1.0/mpfr-4.1.0.sh @@ -12,7 +12,7 @@ src_prepare() { src_configure() { ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --disable-shared # Disable tuning as that might cause non-reproducible build diff --git a/sysc/musl-1.2.3/musl-1.2.3.sh b/sysc/musl-1.2.3/musl-1.2.3.sh index 9e8fafba..55612612 100755 --- a/sysc/musl-1.2.3/musl-1.2.3.sh +++ b/sysc/musl-1.2.3/musl-1.2.3.sh @@ -7,7 +7,7 @@ src_configure() { ./configure \ --host=i386-unknown-linux-musl \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --includedir="${PREFIX}/include/" } @@ -22,7 +22,7 @@ src_install() { rm "${DESTDIR}/lib/ld-musl-i386.so.1" rmdir "${DESTDIR}/lib" mkdir -p "${DESTDIR}${PREFIX}/lib" - ln -sr "${DESTDIR}${PREFIX}/lib/musl/libc.so" "${DESTDIR}${PREFIX}/lib/ld-musl-i386.so.1" + ln -sr "${DESTDIR}${LIBDIR}/libc.so" "${DESTDIR}${PREFIX}/lib/ld-musl-i386.so.1" # Add symlink for ldd mkdir -p "${DESTDIR}${PREFIX}/bin" diff --git a/sysc/openssl-1.1.1l/openssl-1.1.1l.sh b/sysc/openssl-1.1.1l/openssl-1.1.1l.sh index 45858e0e..3d846a6b 100755 --- a/sysc/openssl-1.1.1l/openssl-1.1.1l.sh +++ b/sysc/openssl-1.1.1l/openssl-1.1.1l.sh @@ -18,7 +18,7 @@ src_prepare() { src_configure() { MACHINE=i386 ./config --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ no-shared } diff --git a/sysc/python-2.0.1/stage1.sh b/sysc/python-2.0.1/stage1.sh index 85931c7d..f22014a6 100755 --- a/sysc/python-2.0.1/stage1.sh +++ b/sysc/python-2.0.1/stage1.sh @@ -29,7 +29,7 @@ src_configure() { MACHDEP=linux ac_sys_system=Linux \ ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --with-wctype-functions } diff --git a/sysc/python-2.0.1/stage2.sh b/sysc/python-2.0.1/stage2.sh index 251392e1..1ed25854 100755 --- a/sysc/python-2.0.1/stage2.sh +++ b/sysc/python-2.0.1/stage2.sh @@ -29,7 +29,7 @@ src_configure() { MACHDEP=linux ac_sys_system=Linux \ ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" + --libdir="${LIBDIR}" } src_compile() { diff --git a/sysc/python-2.3.7/stage1.sh b/sysc/python-2.3.7/stage1.sh index 6f22f723..7f9ad9c2 100755 --- a/sysc/python-2.3.7/stage1.sh +++ b/sysc/python-2.3.7/stage1.sh @@ -39,7 +39,7 @@ src_configure() { CFLAGS="-U__DATE__ -U__TIME__" \ ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --with-wctype-functions \ --enable-ipv6 } diff --git a/sysc/python-2.3.7/stage2.sh b/sysc/python-2.3.7/stage2.sh index a28c83ac..e5f6bea3 100755 --- a/sysc/python-2.3.7/stage2.sh +++ b/sysc/python-2.3.7/stage2.sh @@ -41,7 +41,7 @@ src_configure() { CFLAGS="-U__DATE__ -U__TIME__" \ ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --enable-ipv6 } diff --git a/sysc/python-2.5.6/python-2.5.6.sh b/sysc/python-2.5.6/python-2.5.6.sh index 2fdc8e43..dde40ba4 100755 --- a/sysc/python-2.5.6/python-2.5.6.sh +++ b/sysc/python-2.5.6/python-2.5.6.sh @@ -44,12 +44,12 @@ src_prepare() { src_configure() { MACHDEP=linux ac_sys_system=Linux \ CFLAGS="-U__DATE__ -U__TIME__" \ - LDFLAGS="-L/usr/lib/musl" \ + LDFLAGS="-L${LIBDIR}" \ ./configure \ --build=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --with-system-ffi \ --enable-ipv6 } diff --git a/sysc/python-3.1.5/stage1.sh b/sysc/python-3.1.5/stage1.sh index 0e279103..7b60226a 100755 --- a/sysc/python-3.1.5/stage1.sh +++ b/sysc/python-3.1.5/stage1.sh @@ -37,10 +37,10 @@ src_prepare() { src_configure() { MACHDEP=linux ac_sys_system=Linux \ CFLAGS="-U__DATE__ -U__TIME__" \ - LDFLAGS="-L/usr/lib/musl" \ + LDFLAGS="-L${LIBDIR}" \ ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ --with-pydebug \ @@ -72,7 +72,7 @@ src_compile() { src_install() { default - ln --symbolic --relative "${DESTDIR}${PREFIX}/lib/musl/python3.1/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.1/lib-dynload" + ln --symbolic --relative "${DESTDIR}${LIBDIR}/python3.1/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.1/lib-dynload" ln --symbolic --relative "${DESTDIR}${PREFIX}/bin/python3.1" "${DESTDIR}${PREFIX}/bin/python" # Remove non-reproducible .pyc/o files diff --git a/sysc/python-3.1.5/stage2.sh b/sysc/python-3.1.5/stage2.sh index 0fbb3024..6b934fab 100755 --- a/sysc/python-3.1.5/stage2.sh +++ b/sysc/python-3.1.5/stage2.sh @@ -42,10 +42,10 @@ src_prepare() { src_configure() { MACHDEP=linux ac_sys_system=Linux \ CFLAGS="-U__DATE__ -U__TIME__" \ - LDFLAGS="-L/usr/lib/musl" \ + LDFLAGS="-L${LIBDIR}" \ ./configure \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --build=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ --with-pydebug \ @@ -77,7 +77,7 @@ src_compile() { src_install() { default - ln --symbolic --relative "${DESTDIR}${PREFIX}/lib/musl/python3.1/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.1/lib-dynload" + ln --symbolic --relative "${DESTDIR}${LIBDIR}/python3.1/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.1/lib-dynload" ln --symbolic --relative "${DESTDIR}${PREFIX}/bin/python3.1" "${DESTDIR}${PREFIX}/bin/python" # Remove non-reproducible .pyc/o files diff --git a/sysc/python-3.11.1/python-3.11.1.sh b/sysc/python-3.11.1/python-3.11.1.sh index f3ec2ecf..10f11a02 100755 --- a/sysc/python-3.11.1/python-3.11.1.sh +++ b/sysc/python-3.11.1/python-3.11.1.sh @@ -53,13 +53,13 @@ src_configure() { mv Setup.local Modules MACHDEP=linux ac_sys_system=Linux \ CPPFLAGS="-U__DATE__ -U__TIME__" \ - PKG_CONFIG_PATH="${PREFIX}/lib/musl/pkgconfig/" \ + PKG_CONFIG_PATH="${LIBDIR}/pkgconfig/" \ LDFLAGS="-static" \ ./configure \ --build=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --with-system-ffi \ --disable-shared } @@ -97,6 +97,6 @@ src_compile() { src_install() { default - ln --symbolic --relative "${DESTDIR}${PREFIX}/lib/musl/python3.11/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.11/lib-dynload" + ln --symbolic --relative "${DESTDIR}${LIBDIR}/python3.11/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.11/lib-dynload" ln --symbolic --relative "${DESTDIR}${PREFIX}/bin/python3.11" "${DESTDIR}${PREFIX}/bin/python" } diff --git a/sysc/python-3.3.7/python-3.3.7.sh b/sysc/python-3.3.7/python-3.3.7.sh index 387d50b6..4821d407 100755 --- a/sysc/python-3.3.7/python-3.3.7.sh +++ b/sysc/python-3.3.7/python-3.3.7.sh @@ -44,12 +44,12 @@ src_prepare() { src_configure() { MACHDEP=linux ac_sys_system=Linux \ CFLAGS="-U__DATE__ -U__TIME__" \ - LDFLAGS="-L/usr/lib/musl" \ + LDFLAGS="-L${LIBDIR}" \ ./configure \ --build=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --with-system-ffi } @@ -74,7 +74,7 @@ src_compile() { src_install() { default - ln --symbolic --relative "${DESTDIR}${PREFIX}/lib/musl/python3.3/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.3/lib-dynload" + ln --symbolic --relative "${DESTDIR}${LIBDIR}/python3.3/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.3/lib-dynload" ln --symbolic --relative "${DESTDIR}${PREFIX}/bin/python3.3" "${DESTDIR}${PREFIX}/bin/python" # Remove non-reproducible .pyc/o files diff --git a/sysc/python-3.4.10/python-3.4.10.sh b/sysc/python-3.4.10/python-3.4.10.sh index 8bacc5e4..813a8bd6 100755 --- a/sysc/python-3.4.10/python-3.4.10.sh +++ b/sysc/python-3.4.10/python-3.4.10.sh @@ -47,12 +47,12 @@ src_prepare() { src_configure() { MACHDEP=linux ac_sys_system=Linux \ CFLAGS="-U__DATE__ -U__TIME__" \ - LDFLAGS="-L/usr/lib/musl" \ + LDFLAGS="-L${LIBDIR}" \ ./configure \ --build=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --with-system-ffi } @@ -77,7 +77,7 @@ src_compile() { src_install() { default - ln --symbolic --relative "${DESTDIR}${PREFIX}/lib/musl/python3.4/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.4/lib-dynload" + ln --symbolic --relative "${DESTDIR}${LIBDIR}/python3.4/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.4/lib-dynload" ln --symbolic --relative "${DESTDIR}${PREFIX}/bin/python3.4" "${DESTDIR}${PREFIX}/bin/python" # Remove non-reproducible .pyc/o files diff --git a/sysc/python-3.8.16/python-3.8.16.sh b/sysc/python-3.8.16/python-3.8.16.sh index 115efcfa..aa2e7903 100755 --- a/sysc/python-3.8.16/python-3.8.16.sh +++ b/sysc/python-3.8.16/python-3.8.16.sh @@ -41,12 +41,12 @@ src_prepare() { src_configure() { MACHDEP=linux ac_sys_system=Linux \ CPPFLAGS="-U__DATE__ -U__TIME__" \ - LDFLAGS="-L/usr/lib/musl" \ + LDFLAGS="-L${LIBDIR}" \ ./configure \ --build=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \ --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/musl" \ + --libdir="${LIBDIR}" \ --with-system-ffi } @@ -60,7 +60,7 @@ src_compile() { src_install() { default - ln --symbolic --relative "${DESTDIR}${PREFIX}/lib/musl/python3.8/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.8/lib-dynload" + ln --symbolic --relative "${DESTDIR}${LIBDIR}/python3.8/lib-dynload" "${DESTDIR}${PREFIX}/lib/python3.8/lib-dynload" ln --symbolic --relative "${DESTDIR}${PREFIX}/bin/python3.8" "${DESTDIR}${PREFIX}/bin/python" # Remove non-reproducible .pyc/o files diff --git a/sysc/xz-5.0.5/xz-5.0.5.sh b/sysc/xz-5.0.5/xz-5.0.5.sh index 256143ff..774c2f5d 100755 --- a/sysc/xz-5.0.5/xz-5.0.5.sh +++ b/sysc/xz-5.0.5/xz-5.0.5.sh @@ -13,5 +13,5 @@ src_configure() { --prefix="${PREFIX}" \ --disable-shared \ --build=i386-unknown-linux-musl \ - --libdir="${PREFIX}/lib/musl" + --libdir="${LIBDIR}" } diff --git a/sysc/zlib-1.2.13/zlib-1.2.13.sh b/sysc/zlib-1.2.13/zlib-1.2.13.sh index ee19abf0..ab87fc74 100755 --- a/sysc/zlib-1.2.13/zlib-1.2.13.sh +++ b/sysc/zlib-1.2.13/zlib-1.2.13.sh @@ -3,5 +3,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later src_configure() { - ./configure --prefix="${PREFIX}" --libdir="${PREFIX}/lib/musl" --static + ./configure --prefix="${PREFIX}" --libdir="${LIBDIR}" --static }