From 46a5773f66dbd95e4c4ca54b3bf6b7803b5ed17b Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Sat, 28 Jan 2023 19:14:20 +0200 Subject: [PATCH 1/4] Fix a typo in rootfs.py --- rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs.py b/rootfs.py index f174fab..aecfaf4 100755 --- a/rootfs.py +++ b/rootfs.py @@ -116,7 +116,7 @@ def main(): # Tmp validation if args.bwrap and args.tmpfs: - raise ValueError("tmpfs cannot be used writh bwrap.") + raise ValueError("tmpfs cannot be used with bwrap.") # bootstrap.cfg if args.bare_metal: From c3a745c99787c20f0c92e9c5c807299f90195ff4 Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Sat, 28 Jan 2023 18:14:17 +0200 Subject: [PATCH 2/4] Truncate .env file when writing to it This makes no functional difference in practice, but is a bit cleaner in case init scripts are executed multiple times (for testing or otherwise). --- sysb/init | 3 +-- sysc/init | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sysb/init b/sysb/init index 4884a44..9925303 100755 --- a/sysb/init +++ b/sysb/init @@ -37,8 +37,7 @@ install_tar util-linux-2.19.1 0 # Begin sysb bootstrapping process cd "${SOURCES}" -# shellcheck disable=SC2129 -echo "PREFIX=${PREFIX}" >> .env +echo "PREFIX=${PREFIX}" > .env echo "SOURCES=${SOURCES}" >> .env exec ./run.sh diff --git a/sysc/init b/sysc/init index 2d11de0..6f76f76 100755 --- a/sysc/init +++ b/sysc/init @@ -63,8 +63,8 @@ ln -s /usr/bin/bash /usr/bin/sh # Begin sysc bootstrapping process cd "${SOURCES}" +echo "PREFIX=${PREFIX}" > .env # shellcheck disable=SC2129 -echo "PREFIX=${PREFIX}" >> .env echo "SOURCES=${SOURCES}" >> .env echo "DESTDIR=${DESTDIR}" >> .env echo "DISTFILES=${DISTFILES}" >> .env From 59a13f0d09925b8be962583c38a6897ba19337f7 Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Wed, 14 Sep 2022 15:07:13 +0300 Subject: [PATCH 3/4] 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 69e3171..2983d30 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 5942ccb..9e7261c 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 2df180d..232705a 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 46e6852..872398c 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 dc564dc..49d3e78 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 c387dcf..9e1ee60 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 9a05efd..4ab4474 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 4bb705a..b0700bf 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 c9467ac..be498d0 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 cd73d2a..330b75a 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 a9fca78..ba1e9a8 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 d03acd1..6211138 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 f2e5fa1..a5bfece 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 7301f3b..f43ad77 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 8e7bd72..b042a12 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 94991c2..80babc8 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 beb34b0..16fd39e 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 ed75baa..98e76fe 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 1fc2267..8a598a4 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 59f2fe7..6019654 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 b9accf6..c1dd0ef 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 bc80021..3a5c922 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 f26b6b2..c7435dd 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 d18a0c9..000bc76 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 afb3d2a..83b9a06 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 08c838f..053c04c 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 6f76f76..51d1686 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 7f757e4..6d9137c 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 1387d8c..ad4fb5b 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 39b4db5..685e482 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 901b59d..7cba3b0 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 2e20825..6a28c65 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 45d02a2..24d5fa5 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 5f3f0c3..ab76de0 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 9e8fafb..5561261 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 45858e0..3d846a6 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 85931c7..f22014a 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 251392e..1ed2585 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 6f22f72..7f9ad9c 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 a28c83a..e5f6bea 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 2fdc8e4..dde40ba 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 0e27910..7b60226 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 0fbb302..6b934fa 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 f3ec2ec..10f11a0 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 387d50b..4821d40 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 8bacc5e..813a8bd 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 115efcf..aa2e790 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 256143f..774c2f5 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 ee19abf..ab87fc7 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 } From 4204a180e18350fd90ff9301b1a8a96676fe6618 Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Sat, 17 Sep 2022 08:41:10 +0300 Subject: [PATCH 4/4] Rename /usr/lib/musl to /usr/lib/i386-unknown-linux-musl --- sysa/SHA256SUMS.pkgs | 112 ++++++++++++------------ sysa/perl-5.6.2/files/config.sh | 2 +- sysa/run.sh | 2 +- sysc/autogen-5.18.16/autogen-5.18.16.sh | 2 +- sysc/init | 2 +- sysc/musl-1.2.3/files/ld-musl-i386.path | 2 +- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs index ee5f869..6e128e4 100644 --- a/sysa/SHA256SUMS.pkgs +++ b/sysa/SHA256SUMS.pkgs @@ -12,7 +12,7 @@ d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4 autoconf-2.64_ 298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b autoconf-2.69_0.tar.bz2 8c2401edf1c68910005bbcb8b8e84727a46f7d9643d2ad1267bd0259078dadc4 autoconf-2.71_0.tar.bz2 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b autoconf-archive-2021.02.19_0.tar.bz2 -9f5da26c871827c17a9d571cefdfa8f3711717b32b2667fa871aaf5abf5efa09 autogen-5.18.16_0.tar.bz2 +0a461c42d300889c761d41c32fd6077b830d6f521711c82564e5104df936b768 autogen-5.18.16_0.tar.bz2 fbd8739c8f69b388e2c54893faa1180cc38f2718339da82788312adb0201c5d0 automake-1.10.3_0.tar.bz2 7014bcba2fc112f3c22129a69b32dd3939eac97267d0ee271aa35853fdeee9fe automake-1.11.2_0.tar.bz2 a7bd12bd0c639783ce1c0e9f640cf004a87460bbda8154bc550c5e6884457b48 automake-1.15.1_0.tar.bz2 @@ -21,96 +21,96 @@ a7bd12bd0c639783ce1c0e9f640cf004a87460bbda8154bc550c5e6884457b48 automake-1.15. 8ec3af09fd23256f89b27833a8311ed347caf93d611b1209232ce104bb6fb4ef automake-1.6.3_0.tar.bz2 031119cb14859c8bf80d5df5e0bbc475cf67f04b645dc55c80bcabe1bb31a8cd automake-1.6.3_1.tar.bz2 b2eab85c4a22060cc18945f6cb24cdf928fee370fff3fe12482e866a1cace586 automake-1.6.3_2.tar.bz2 -58a9ccbba82dda35673404135a855c19351ac758b2ac0c1e112d193b1dfb7df5 automake-1.7_0.tar.bz2 76e897ec8e683eb15ab621c3a0d86613bc7cae43631c94e9c6388eb08db191ca automake-1.7.8_0.tar.bz2 +58a9ccbba82dda35673404135a855c19351ac758b2ac0c1e112d193b1dfb7df5 automake-1.7_0.tar.bz2 75c5f2c2f636c4d763eef650ffdf638ff372444dce74e5c9bfe7c5ec824c2a26 automake-1.8.5_0.tar.bz2 42fe9a42c457193e7bebf31b71eb28bc71e179ed9f2c78be242a5f6b03bbbbfe automake-1.9.6_0.tar.bz2 -e180c61e3922b0546a6a3ee498abeba6dfdd404215ca850628a5277e5ede26e7 bash-5.1_0.tar.bz2 -a6190872c4daf1b55a1ad1f2fd2e34bd251f3808f750bb4a7920b66d672497a8 binutils-2.14_0.tar.bz2 -de02e056b767196332b566ca3d6fb9d283872621519a2afa980c69d15178dbc7 binutils-2.38_0.tar.bz2 -e90a754c0072e3660ab209b7255868bee2e8e07611bfbdfb742697100345331d bison-2.3_0.tar.bz2 +b2729f1d776d26fbf7781aeeb569e2550c484fb9d2722dd207542480de0d4879 bash-5.1_0.tar.bz2 +c336e6ce463024af39e9db954bf781bee3d80c2c39d76f491b5261288485b77f binutils-2.14_0.tar.bz2 +12d2aea83a512ff3971103aa9e5925c40536b5273c20267458f819658a7cf567 binutils-2.38_0.tar.bz2 +78035718b7ad659ba83f120405ad591f8ab0afb01f09805da7b3ab793d22a12c 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 -a3266333620a13f4a4c8f4f9819dc6f1fcded7f74bcb9fbf46518f3b160cf930 bison-3.4.2_0.tar.bz2 +679a4207b70d22d96aa3afd6ca9053acabdde0092b7c225e0049b899739969e3 bison-3.4.2_0.tar.bz2 09bef4ec506ccafc42ad925f9c038af9885cd8ebca294cf042e63a7d39e91bb5 bzip2-1.0.8_0.tar.bz2 ee54199d62226e22a10f9d816902d71e220ca4bcf5f7508c259702c6f480c446 ca-certificates-3.86_0.tar.bz2 c4d59e759f7349b96f74e62d867e419f3d85fbb81eaf5f79f996abf48f0d3170 coreutils-5.0_0.tar.bz2 776ef3e13870fba6fc9cec64eaf40fb658abecc99c65724968013f8f8a177802 coreutils-6.10_0.tar.bz2 b8992f675350658b106c3066cac0ee31440020bc9d6128bfc2fdf1fde60efd74 coreutils-8.32_0.tar.bz2 -cba4028b63755fd3865552fb625e9b94ac4260fcc47a7579d3bba4a9d3de4924 curl-7.83.0_0.tar.bz2 -06496a8b959f9bfad9058005641015288f25bce627fc42254cb101fb01887626 curl-7.83.0_1.tar.bz2 -0f0537eac71787a4da8b39152be9a0d4eba98fd61b7387a7d777fb325552bc96 dhcpcd-9.4.1_0.tar.bz2 +56f7a46ebd48966fe8f5c8874e1b7d0e5d53be645f65d7e790053fcf4fe3ee4d curl-7.83.0_0.tar.bz2 +c0d6500bd04e377b25d80aca98c4459394cd3f2633d96fb1c1c417a3c75ff168 curl-7.83.0_1.tar.bz2 +8cbaebe94bc256ab236d291fe38b13299b6719bfdba5f710c2d50a558cbcb956 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 f55c11b091361536774b436abe86b17f759cd7a66522cd20c7a2190da92db67a findutils-4.2.33_0.tar.bz2 27103b13dbc6112c2c51907969a44edc24ca3db3aea444e51b9e8d2561c94755 flex-2.5.11_0.tar.bz2 -33afd1c66c864b486df290e682883556787c61751b8c851deb2737f0b777ffd6 flex-2.5.33_0.tar.bz2 +8f84b8af3d6a16312858d1d6b18d0e31f03976e6d1103d0e93b50d1313985db1 flex-2.5.33_0.tar.bz2 000147c1a33feff5c5b4cb10c2cf6c2b2f4ef92a90c9e659b25f1766a83d4afc flex-2.6.4_0.tar.bz2 92fe0ffd0971a40fd98c70b075d5bb12f2d8093ef8fb3333aac2b532bd53a591 gawk-3.0.4_0.tar.bz2 -2a805827b214605a82648b333fdd8bfca7a0f057671c089ff2c5bcb144aa8be6 gc-8.0.4_0.tar.bz2 -07715a0c8bc13b80fc10ede20573f92e933b8d3dc6a5c8700f4289965ea8ec74 gcc-4.0.4_0.tar.bz2 -e7c678c71c51cd6e8ce6eae029503a661169e6994ba0f988ac15634254d1fadb gcc-4.0.4_1.tar.bz2 -b90cf37e7d0391dba6b1943c7527b0d5f5f9c7e399070828af6f1c39a1323883 gcc-4.7.4_0.tar.bz2 -6e468a87e3bb80b4756bc6925127c230ab0c526c6d353c4fbf123244fa93435e gettext-0.21_0.tar.bz2 -fe16fb6021f1f4650c98f77261145f37732be0aee06e957b0bdb3b01beb593a8 gmp-6.2.1_0.tar.bz2 +458b64a564ca1ef32ed1c682187caa59743a772210fc51a2bc7f11859bdc98f8 gc-8.0.4_0.tar.bz2 +ebbc144e18ca908295845c707f10df82a3337732cc167fcc251b6e6c508d454e gcc-4.0.4_0.tar.bz2 +5d3d9bae0069fd4388392b91a47bba4d7ce6733ca9075742ef0d4a4cab899803 gcc-4.0.4_1.tar.bz2 +8ab35eceef7dca2f532e254b2b3311f84ebea23f9bedee025806ed5b4513e523 gcc-4.7.4_0.tar.bz2 +99891d9413e7d3923bd1466d1bb24fdad5c0b41735a4b614d4029ec9512df0c9 gettext-0.21_0.tar.bz2 +8906ece680934b78ea0fb5f950595b6480b8fbd06481039547ec7a370cb6e6bf gmp-6.2.1_0.tar.bz2 3fd7b8e71183060864420479bd36a6853119c4eae5568672838cae23b7dc1050 gperf-3.1_0.tar.bz2 390840f2bc9c2a3196c28e06f8650f408e33b5d4ffe5539e174682ed13960bc9 grep-2.4_0.tar.bz2 2bf89c0140ff98c44812fd6793cc5fb7a70391394d45b1893c56650ff6f04543 grep-3.7_0.tar.bz2 -797b67539530b3dd1530275eaa932d3b473116e2ccd064e83457f38fd5537a78 guile-3.0.7_0.tar.bz2 +82c33928cfcf83746d73505560ade7dad6e133a431a3bb816123806630889a55 guile-3.0.7_0.tar.bz2 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 -ff6a9f179d44c0112e080150e36ba51e93a2ac4146a707f4c18bae5d1d78f960 libatomic_ops-7.6.10_0.tar.bz2 -09e3cd965c2cd826f5f4bb315b9eb8479c4f820812ca99bdc623b0c9b9ffc288 libffi-3.3_0.tar.bz2 -5001f8fdbba0db0ecf60263bfea97ed4b9174d06a447e98bee220548f973756a libtool-1.4_0.tar.bz2 -94d0f9d2f8fbc2b00fe4c0f479e5590fa70b7d856f0a643ad006787d963f99ee libtool-2.2.4_0.tar.bz2 -374214711d42681d030d6faceba3198243ec22301d94212f7162bd4873b7ba27 libtool-2.4.7_0.tar.bz2 -2e92ba350a5b4c67cfe6678d1ac5f430bc387ac5172757f11a6e50e794ff4068 libunistring-0.9.10_0.tar.bz2 +ca060691a62d9a4e56406aa984c6fcc60db718e0f953991a961c4fe2b18cf04f kexec-tools-2.0.22_0.tar.bz2 +bb53d9d46fe787a09d5ddaf3d7bcd335f00ae192511a9e393f12149d74557952 libarchive-3.5.2_0.tar.bz2 +e479b8ba2e13081bf31a416c463be98feb3f747630418de7ed40f309005c3412 libatomic_ops-7.6.10_0.tar.bz2 +fcf30550a8e84be824fd2296a7964c404cb54e9df2f31af484a504342342c0fe libffi-3.3_0.tar.bz2 +680f574536735dd9519e8d9505872df1396daaea319e669ebb55ab8b53958915 libtool-1.4_0.tar.bz2 +a153fe22c4cd96b95e870edc351bee3bff8e6419f33b8a6b0ff81010cf786df0 libtool-2.2.4_0.tar.bz2 +f0948ab4f1172cd4a8a23192898ca0c871574a5c7a0673abb88ef03000278459 libtool-2.4.7_0.tar.bz2 +564fcf89cb762b99e58dddb39c3812084a701447209bd4cf0dc06661e337c265 libunistring-0.9.10_0.tar.bz2 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 c4fc071e0911a01efae11b8735c8e69a8963d9a545befffd01486de7589b201a make-3.82_0.tar.bz2 47470be468d66a85e71cbecbbf22038260c6e91408105ba0684c3ee61b39085f make-4.2.1_0.tar.bz2 -3205490c472448de2f67aee7ff3190bb9ac493eca6fc5c8ce79b145d8b23268a mpc-1.2.1_0.tar.bz2 -ffeadd2b9d9e72edb5b15750b50a6c0c47bb90a1cb14ba66732aa733e0209e50 mpfr-4.1.0_0.tar.bz2 -c8e2bdfd5e7a9f30c313511fdd3786d12add252b9e30154c28c079455af25cf5 musl-1.1.24_0.tar.bz2 -7f3251ee05aaa38e9803db41104acbfa399873a31591411c3580d181a6461d0c musl-1.1.24_1.tar.bz2 -9f3d2b47634860cfd5f03fa3346ef9a60a6dab57164ee974578dbb7f4a45e16b musl-1.1.24_2.tar.bz2 -af949ecc98bdc3b94d0f74e5d38a3c3710712a029ddb6cf9b801390e1d626b3c musl-1.2.3_0.tar.bz2 -53c66bd2101f5fd71c14b88f62e7eaf17de87335d3a21518248dd4d570520e61 musl-1.2.3_1.tar.bz2 -df12820e27abfe07c4c27bb2f9abf2e0758b797d5d3036e29d6c57cfb5aa12d6 openssl-1.1.1l_0.tar.bz2 -0f59d97601d204b8273255b4dea8891464c88fcb9e908af799923ccdb934b7fc patch-2.7.6_0.tar.bz2 +29572dea62b19dcc8c4aa5df7edfba9755881d9b56ec488b65a779a5193515a9 mpc-1.2.1_0.tar.bz2 +dabb21e7b8b447e0ec2578e3cd13a96eb0a6d0508a6ce47854b7505a0d4c645e mpfr-4.1.0_0.tar.bz2 +cfcbd78bd4818a3543e0f63659640472e3307746d4c894676bc21e72e9d30717 musl-1.1.24_0.tar.bz2 +d336f2c1999ec74b36062d48b70d47593cc12f6273d54d19eae26859f9feaebe musl-1.1.24_1.tar.bz2 +63dbcae0202f1546d0c7e9dfa168f8b28c0c6bd9fc44573f0f2c9f899743b77b musl-1.1.24_2.tar.bz2 +969a1b9467308de7546bcec8c149f1cfa5c9abf0a4b2f86b9724e75ada220c24 musl-1.2.3_0.tar.bz2 +3a5f71d735239e56cfc6d7d0a8a5ba1540958a1a552d2af25bcd9ad055082130 musl-1.2.3_1.tar.bz2 +94cda4ceabe2313f57e067a3f4324c4f40ecdcb69e8a8e2669a6b65ef4b82fb5 openssl-1.1.1l_0.tar.bz2 +028d6ed9f0a41b275d763964313b88f58e944b72d8a7d45c72f5ef7b2e64fa92 patch-2.7.6_0.tar.bz2 75fffc4bb14f14281bc1853455888d1d818b7027efc1e4014af1a755771a64e8 perl-5.000_0.tar.bz2 3a709c914e7d01f5bfd12d8d859ac7135d9ac57528cb2e325448f91cfb4869b8 perl-5.003_0.tar.bz2 +4b79a1694c471663391793939f60c810aec65b03ef80f8dd811cea181f8e7fb2 perl-5.10.1_0.tar.bz2 +8ec923d35e6296932409f613da990d61d6ed86806c34fb4c1cc812df624ef77c perl-5.32.1_0.tar.bz2 +c7999aabdd425cd3246e8a50440b6cbe2fe2c7dd805abcbdd156ccf5b2ffccfa perl-5.6.2_0.tar.bz2 23ea39db272dcbbeedf2ea6e758052228b0a764be462c0562339b58ae472d83d perl5.004-05_0.tar.bz2 041aed738c039a8c437c6d29530fe44f55bd5fc9ac2bb54f793f6fe3a9df16fd perl5.005-03_0.tar.bz2 -4b79a1694c471663391793939f60c810aec65b03ef80f8dd811cea181f8e7fb2 perl-5.10.1_0.tar.bz2 -31eda69af533e26b0cae543e02f2024fc2663dc47605f57fa58652117cbc1460 perl-5.32.1_0.tar.bz2 -9ceb09af82397f98e99e339cb4fd3abd9f61d222ea7e6a0920e2f3a7c316c70a perl-5.6.2_0.tar.bz2 -c69e0197ebc1bf9f9fc68a06d4c649c934784077058c24a484da59a153132816 pkg-config-0.29.2_0.tar.bz2 +abe4b7bb3a66ae5b7f0dfdbaeb1c28717115f5a49bc52e429739227adfec3fbf pkg-config-0.29.2_0.tar.bz2 a04ac45d76a5432aa1f1492ec8787dd2834212568f95f65b17f7640892504458 python-2.0.1_0.tar.bz2 bd94e4a3a5d1af32056f096d01982ed36498f75fdc06cff3aa8db8a4917cf0b0 python-2.0.1_1.tar.bz2 -d6266631cfced8f7be91ec48897ccd29f4bd974e8668731ea47bec8da0ee1e4b python-2.3.7_0.tar.bz2 -1cf5705c47fbd86e7429b0825254076b3ecce1086f66d1dff8888ec2d5dc8be0 python-2.3.7_1.tar.bz2 -644f4089ad60a9085500b5d1c6f991b590689b1f9516891b9b89f0359187b5e9 python-2.5.6_0.tar.bz2 -f56fb0fb2148edeedf276f2bd7e4dbc39e276b44dff766e3997c26d195248974 python-3.1.5_0.tar.bz2 -faa100ea90445983531e90e5e570ad4f559aca4165cfee6caa0ab9036a065bfb python-3.1.5_1.tar.bz2 -f297082aeecba9e539c4ea22ac0d10e9b73950d54f4f5d394e7227ea960a577c python-3.3.7_0.tar.bz2 -d9c26b6764735a21dc9cea68044e3f5f386ac70712a735ff8f497169e16e713f python-3.4.10_0.tar.bz2 -68c701e8a33413843b19aba94da4c3f45618f86787ea9ccac608092b3bb0cb32 python-3.8.16_0.tar.bz2 -e4baae4350c5ccc54717e77c10a3a2ee9cc6c626bd4d3751c0b5cacf0a9cace0 python-3.11.1_0.tar.bz2 +9817dd53e93c270836ee7b452a91dc0ceffdb766e572d87ae3cec8b5d2b8e5bf python-2.3.7_0.tar.bz2 +fb79e89cca947ef64a6a2217e2940d196eea8e6f08ba39495809cbda29cfc94f python-2.3.7_1.tar.bz2 +8d9164d477e25f5246f2ca900510d177a52ee19048b4fb8c8d0124d97a04e7c1 python-2.5.6_0.tar.bz2 +575ed9dc146375ac2d77daceb5987db90ff82435a82b6c58bd8a8d488f37b004 python-3.1.5_0.tar.bz2 +87150a7e0899e22142f32f6dbadf3d35fced97dfad078253474a815b4320c31e python-3.1.5_1.tar.bz2 +80ccfbe08397626ed79f66d9c7a457d059cd5307e55a8fe4e6948ceba31cb1cf python-3.11.1_0.tar.bz2 +a777662a1c7ceeb8800809f8952c90854fcfc9f1c55624c111e156f488a6e61c python-3.3.7_0.tar.bz2 +81a32c5dd16b2d43d5ea3b1f54cf212e4a0dd215ac5168a6b7c89b90ef149e51 python-3.4.10_0.tar.bz2 +53ff89360cb1954de33accffbe234d1927b34923e13a4f7aea8e3e91b9414f2d python-3.8.16_0.tar.bz2 8a0248fbf8fe1764580698415cc3628585d4dd054ddf63040f400e18cbaef7a4 sed-4.0.9_0.tar.bz2 177553732a080e25ba5778525743543e9da012122f4ad0d314a425ca87a3c2bd sed-4.8_0.tar.bz2 -f3be04bb46c9ac80180defa46c274214ab00b5b4dd9c8a3a6de162e43ef0fa20 tar-1.34_0.tar.bz2 +40040522e886fbd2634a115651089658d30935ff47f0649b08988cbade8ef418 tar-1.34_0.tar.bz2 5e7fdb405574717e3759144fab500954817ab8852d2da6111d43cb9fe77f01ac tcc-0.9.27_0.tar.bz2 -42b8eabbd299737541b57b3aa362eeeb20499449901fc2a4895302ce0117080c tcc-0.9.27_1.tar.bz2 -db57c6ef39965f0562d2aefe3c06571df50ba1265446d97f2714d80518862cef tcc-0.9.27_2.tar.bz2 -e2014b844b1a79cda9142a38af0404efd242ae02f77aa286c968e4ad6ad87265 tcc-0.9.27_3.tar.bz2 -0c8b02693dac9483d845e7754919fdf21e97d695e5de13893c1356d0a9c22946 texinfo-6.7_0.tar.bz2 -e3fb8277bec3c93887029d51aea1c53216fee41b8e5be5ff447da1cf543641c6 util-linux-2.19.1_0.tar.bz2 +6ae5088089614a95958db950172775b80041f8f9b245060ce2912b8eac88d045 tcc-0.9.27_1.tar.bz2 +9de3d8e470f5e5ce773790ea4058d057cceda5cfca9c61411fda754a25c29210 tcc-0.9.27_2.tar.bz2 +7fb6d95e08fa90ef5d75cd26f650984b18a96bd65465d4be1a50bb097bb30075 tcc-0.9.27_3.tar.bz2 +4e27d5af7c7b9c6a38aebbedd09cc62ef7bc9d491afb3fd4c95de6b843423590 texinfo-6.7_0.tar.bz2 +1b0befc770a21ae39e31930830142370a753b3b2e3158d4b335001e44ba96193 util-linux-2.19.1_0.tar.bz2 284d176b39312795bf155b794fc3c02070ff788d19307e926429fa3299faf283 which-2.21_0.tar.bz2 -e900a8b70f49bfcbb7a48bd27e2de67c30454d693b6f35dcdfadd35570e98e69 xz-5.0.5_0.tar.bz2 -068fcf87574883b29734bda3ccc45ef0e2be7aa6fb7e86941c78eb5a4de61389 zlib-1.2.13_0.tar.bz2 +08b846acf75e7777d5b671fe8e1d086fbc95208e4ccac4c214120fcd9df02cba xz-5.0.5_0.tar.bz2 +db1439202155e771b37cfdefde179ebbe88a6f25ba4527dc2b979c0cb15b930e zlib-1.2.13_0.tar.bz2 diff --git a/sysa/perl-5.6.2/files/config.sh b/sysa/perl-5.6.2/files/config.sh index d9191d4..9c07f1e 100644 --- a/sysa/perl-5.6.2/files/config.sh +++ b/sysa/perl-5.6.2/files/config.sh @@ -6,7 +6,7 @@ ar='tcc -ar' cc='tcc' ldlibpthname='LD_LIBRARY_PATH' -libpth='/usr/lib/musl' +libpth='/usr/lib/i386-unknown-linux-musl' path_sep=':' archname='' osvers='' diff --git a/sysa/run.sh b/sysa/run.sh index ba1e9a8..6463d58 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -11,7 +11,7 @@ set -e # shellcheck disable=SC2154 PREFIX="${prefix}" # shellcheck disable=SC2034 -LIBDIR="${prefix}/lib/musl" +LIBDIR="${prefix}/lib/i386-unknown-linux-musl" # shellcheck disable=SC2154 SOURCES="${sysa}" DISTFILES="${sysa}/distfiles" 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 80babc8..5be98f0 100755 --- a/sysc/autogen-5.18.16/autogen-5.18.16.sh +++ b/sysc/autogen-5.18.16/autogen-5.18.16.sh @@ -43,7 +43,7 @@ src_compile() { # Specify timeout to avoid non-reproducibility ./configure \ --prefix="${FINALPREFIX}" \ - --libdir="${FINALPREFIX}/lib/musl" \ + --libdir="${FINALPREFIX}/lib/i386-unknown-linux-musl" \ --disable-shared \ --enable-timeout=15 touch doc/agdoc.texi # build later diff --git a/sysc/init b/sysc/init index 51d1686..4ea8eb0 100755 --- a/sysc/init +++ b/sysc/init @@ -8,7 +8,7 @@ set -e PREFIX=/usr -LIBDIR="${PREFIX}/lib/musl" +LIBDIR="${PREFIX}/lib/i386-unknown-linux-musl" SOURCES="${PREFIX}/src" DESTDIR=/tmp/destdir DISTFILES=/distfiles diff --git a/sysc/musl-1.2.3/files/ld-musl-i386.path b/sysc/musl-1.2.3/files/ld-musl-i386.path index af2116f..2b70d5b 100644 --- a/sysc/musl-1.2.3/files/ld-musl-i386.path +++ b/sysc/musl-1.2.3/files/ld-musl-i386.path @@ -1 +1 @@ -/usr/lib/musl +/usr/lib/i386-unknown-linux-musl