kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-16 08:15:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add LIBDIR variable for the musl library directory

Browse source 
LIBDIR should be used where possible to avoid unnecessary
duplication in build scripts that target the musl toolchain.

No change in package hashes.
This commit is contained in:
Dor Askayo 2022-09-14 15:07:13 +03:00
parent c3a745c997
commit 59a13f0d09
49 changed files with 77 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sysa/binutils-2.14/binutils-2.14.sh
View file

@ -122,7 +122,7 @@ src_configure() {
--with-sysroot="${PREFIX}" \
--disable-64-bit-bfd \
--prefix="${PREFIX}" \
--libdir="${PREFIX}/lib/musl" \
--libdir="${LIBDIR}" \
--srcdir=.
cd ..
done

2
sysa/curl-7.83.0/curl-7.83.0.sh
View file

@ -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 \

2
sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh
View file

@ -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

10
sysa/gcc-4.0.4/pass1.sh
View file

@ -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"
}

6
sysa/gcc-4.0.4/pass2.sh
View file

@ -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"
}

2
sysa/libtool-1.4/libtool-1.4.sh
View file

@ -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 \

2
sysa/libtool-2.2.4/libtool-2.2.4.sh
View file

@ -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 \

2
sysa/musl-1.1.24/binutils-rebuild.sh
View file

@ -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

2
sysa/musl-1.1.24/musl-1.1.24.sh
View file

@ -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

2
sysa/musl-1.2.3/musl-1.2.3.sh
View file

@ -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

2
sysa/run.sh
View file

@ -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"

2
sysa/tcc-0.9.27/tcc-musl-pass1.sh
View file

@ -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

2
sysa/tcc-0.9.27/tcc-musl-pass2.sh
View file

@ -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

2
sysa/tcc-0.9.27/tcc-musl-pass3.sh
View file

@ -10,7 +10,7 @@ src_prepare() {
}
src_compile() {
export libdir=${PREFIX}/lib/musl
export libdir=${LIBDIR}
export incdir=${PREFIX}/include
export bindir=${PREFIX}/bin

2
sysa/util-linux-2.19.1/util-linux-2.19.1.sh
View file

@ -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 \