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 ++++++++++++----- core/musl/checksums | 15 ++++++++------- core/musl/sources | 2 +- core/musl/version | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) (limited to 'core') 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 diff --git a/core/musl/checksums b/core/musl/checksums index fe5203f2..4f9d65fb 100644 --- a/core/musl/checksums +++ b/core/musl/checksums @@ -1,7 +1,8 @@ -9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd musl-1.2.2.tar.gz -30bb6d7e0e0b61fcd95d830c376c829a614bce4683c1b97e06c201ec2c6e839a cdefs.h -c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h -e1e498a79bf160a5766fa560f2b07b206fe89fe21a62600c77d72e00a6992f92 tree.h -d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c getconf.c -18f323b671fb40a53732c05cdaa6f2e8b8603051c546e73fda5447944dc7c037 getent -299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c +%BLAKE3 +dd4d86b7f568ec1650d473d79697ea5df7a7b1a7fb71859a33f6e3161e62aecc musl-1.2.3.tar.gz +936eb5830af322af38a1d08d02cc1d31ae95efdbc2e381b0e5fa6e91eebe693e cdefs.h +619fd80e4d195caa65ee96b4338a1e68ed16bdc41cbe90ac15730c359bca8209 queue.h +c712195c178941f6c90ab09c99639a06e49c240c932c632189033d961af05279 tree.h +9949f50c6d3b639a65986fd8a0cd44e9b9ea886ae137ba53e300f20545ee3118 getconf.c +5175d496208956bf62391765e69266694fcc957cb6feaacb65819466f7218f7b getent +acf8e5701761f8b10449445487906c37b70fee5031dc1c140e704a97ced5de3c __stack_chk_fail_local.c diff --git a/core/musl/sources b/core/musl/sources index 40571d85..e9b51fa5 100644 --- a/core/musl/sources +++ b/core/musl/sources @@ -1,4 +1,4 @@ -https://www.musl-libc.org/releases/musl-1.2.2.tar.gz +https://www.musl-libc.org/releases/musl-1.2.3.tar.gz files/cdefs.h files/queue.h files/tree.h diff --git a/core/musl/version b/core/musl/version index 52669276..883a7ecf 100644 --- a/core/musl/version +++ b/core/musl/version @@ -1 +1 @@ -1.2.2 1 +1.2.3 1 -- cgit v1.2.3