From da0b030174302f47fe73914daa3a5669e1a4788c Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Thu, 14 Apr 2022 14:22:33 +0200 Subject: musl: bump to 1.2.3 --- core/musl/build | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'core/musl/build') diff --git a/core/musl/build b/core/musl/build index ec4352f5..153f8dd2 100755 --- a/core/musl/build +++ b/core/musl/build @@ -5,6 +5,18 @@ # we are only supporting i686 and x86_64. sys_arch="$(uname -m)" +# Bootstrap if the package isn't installed yet. +cpt l -q musl || { + ./configure \ + --prefix="$PWD/tmp" + + make ALL_TOOLS+=obj/musl-gcc + make ALL_TOOLS+=obj/musl-gcc lib/musl-gcc.specs + make ALL_TOOLS+=obj/musl-gcc install + cp lib/musl-gcc.specs "$PWD/tmp/lib" + export CC="$PWD/tmp/bin/musl-gcc" +} + ./configure \ --prefix=/usr \ --syslibdir=/usr/lib @@ -28,10 +40,5 @@ clinst -Dm755 -t "$1/usr/include/sys" cdefs.h queue.h tree.h # Install getconf. "${CC:=cc}" --static getconf.c -o "$1/usr/bin/getconf" -case $sys_arch in i*86) - "$CC" -c __stack_chk_fail_local.c -o __stack_chk_fail_local.o - ar r "$1/usr/lib/libssp_nonshared.a" __stack_chk_fail_local.o -esac - # Install getent clinst -Dm755 -t "$1/usr/bin" getent -- cgit v1.2.3