Rebuild musl 1.2.3 with support for dynamic linking

Now that GCC and binutils support musl's toolchain natively, musl can
have its dynamic linking support enabled without ill-effects.
This commit is contained in:
Dor Askayo 2022-09-07 23:34:25 +03:00
parent 238520fee7
commit 9bde9d1afe
8 changed files with 50 additions and 4 deletions

View File

@ -9,6 +9,6 @@ Source: https://github.com/fosslinux/live-bootstrap
# Copyright: $YEAR $NAME <$CONTACT>
# License: ...
Files: sys*/SHA256SUMS.sources sysa/pre-sha.sha256sums sysa/*/*.checksums sysa/SHA256SUMS.pkgs
Files: sys*/SHA256SUMS.sources sysa/pre-sha.sha256sums sysa/*/*.checksums sysa/SHA256SUMS.pkgs sysc/musl-1.2.3/ld-musl-i386.path
Copyright: none
License: MIT

View File

@ -792,6 +792,12 @@ This version of binutils provides a more comprehensive set of programming tools
creating and managing binary programs. It also includes modern versions of the ``ld``
linker, the ``as`` assembler and the ``ar`` program.
musl 1.2.3
==========
With GCC and binutils supporting a musl-based toolchain natively, musl itself is rebuilt
with support for dynamic linking.
gperf 3.1
=========

View File

@ -54,9 +54,9 @@ e7c678c71c51cd6e8ce6eae029503a661169e6994ba0f988ac15634254d1fadb gcc-4.0.4_1.ta
edbe2c9ad51858feffe869aae25aec9de99d85fc0566ec883354ddd9e9b5060c gcc-4.7.4_0.x86.xbps
b5f6fe07a696751d2fc1d9cc3d96f09d89d6a637e1d8d0b250105b650e831600 gettext-0.21_0.x86.xbps
fe16fb6021f1f4650c98f77261145f37732be0aee06e957b0bdb3b01beb593a8 gmp-6.2.1_0.tar.bz2
a11a48dd24beda2b94d53df3305dfd9a0fc56d320a8eb9bc69df2d418b60ecf9 gperf-3.1_0.x86.xbps
73742c85954e9899ef76385698b791664a542ab0b580ae2d789445c683af509b gperf-3.1_0.x86.xbps
390840f2bc9c2a3196c28e06f8650f408e33b5d4ffe5539e174682ed13960bc9 grep-2.4_0.tar.bz2
b9b42672081a3b1901950495638a875dbe6e2546aa443a55d73ad550d7a3768f guile-3.0.7_0.x86.xbps
d10b24962b9d0a580f9db4816a44f31877048c7c9e4b2d5e3d99609e39a8c028 guile-3.0.7_0.x86.xbps
ec6b32cba3f49f860a3d9b97cea57931869c5849d8ca5ad0ea01dad45b9edb91 help2man-1.36.4_0.tar.bz2
2ef01fe7252be680382bee5df890ad3f6dae26744104ccdaa2d1236bc19ab44a kbd-1.15_0.tar.bz2
68c272b50a99e4d53cab57552337e7660020a47c06a0341efcdfa4f2441db187 kexec-tools-2.0.22_0.tar.bz2
@ -66,7 +66,7 @@ bd17cec1e4d5eabaa474bbe671cc33af71dce8155206221a310a98bdc5f52fd3 libffi-3.3_0.x
5001f8fdbba0db0ecf60263bfea97ed4b9174d06a447e98bee220548f973756a libtool-1.4_0.tar.bz2
94d0f9d2f8fbc2b00fe4c0f479e5590fa70b7d856f0a643ad006787d963f99ee libtool-2.2.4_0.tar.bz2
374214711d42681d030d6faceba3198243ec22301d94212f7162bd4873b7ba27 libtool-2.4.7_0.tar.bz2
aa5682f17b8f68a5807bf8a11e0ce324ca88ce7e7005e891c1122bbbf77f33a4 libunistring-0.9.10_0.x86.xbps
f4018015c72f4ed1e172a34db41e9547c389ed7caeeb7f379a081e0bf9ccac88 libunistring-0.9.10_0.x86.xbps
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
@ -78,6 +78,7 @@ ffeadd2b9d9e72edb5b15750b50a6c0c47bb90a1cb14ba66732aa733e0209e50 mpfr-4.1.0_0.t
7f3251ee05aaa38e9803db41104acbfa399873a31591411c3580d181a6461d0c musl-1.1.24_1.tar.bz2
9f3d2b47634860cfd5f03fa3346ef9a60a6dab57164ee974578dbb7f4a45e16b musl-1.1.24_2.tar.bz2
af949ecc98bdc3b94d0f74e5d38a3c3710712a029ddb6cf9b801390e1d626b3c musl-1.2.3_0.tar.bz2
d8b2d15c6d7d9f9a5e49d740aaa77db90ad2814423d4724727e014e1a63285c2 musl-1.2.3_1.x86.xbps
df12820e27abfe07c4c27bb2f9abf2e0758b797d5d3036e29d6c57cfb5aa12d6 openssl-1.1.1l_0.tar.bz2
189443aecea6e8435d1243071c2e46d7e4bb8f79f2929ae6a6c96eea40394a35 patch-2.7.6_0.x86.xbps
75fffc4bb14f14281bc1853455888d1d818b7027efc1e4014af1a755771a64e8 perl-5.000_0.tar.bz2

View File

@ -189,6 +189,9 @@ class SysC(SysGeneral):
# binutils 2.38
self.get_file("https://mirrors.kernel.org/gnu/binutils/binutils-2.38.tar.xz")
# musl 1.2.3
self.get_file("https://musl.libc.org/releases/musl-1.2.3.tar.gz")
# gperf 3.1
self.get_file("https://mirrors.kernel.org/gnu/gperf/gperf-3.1.tar.gz")

View File

@ -37,6 +37,7 @@ eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7 libunistring-0
e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 make-4.2.1.tar.gz
17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459 mpc-1.2.1.tar.gz
0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f mpfr-4.1.0.tar.xz
7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4 musl-1.2.3.tar.gz
f455f341e787c1167328e80a84f77b9a557d595066dda6486a1874d72da68800 nss-3.78.tar.gz
0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz
ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz

View File

@ -0,0 +1 @@
/usr/lib/musl

32
sysc/musl-1.2.3/musl-1.2.3.sh Executable file
View File

@ -0,0 +1,32 @@
# SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
#
# SPDX-License-Identifier: GPL-3.0-or-later
urls="https://musl.libc.org/releases/musl-1.2.3.tar.gz"
src_configure() {
./configure \
--host=i386-unknown-linux-musl \
--prefix="${PREFIX}" \
--libdir="${PREFIX}/lib/musl" \
--includedir="${PREFIX}/include/"
}
src_compile() {
make CROSS_COMPILE=
}
src_install() {
default
# Make dynamic linker symlink relative in ${PREFIX}/lib
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"
# Add library search path configurtion
mkdir -p "${DESTDIR}/etc"
cp ../../ld-musl-i386.path "${DESTDIR}/etc"
}

View File

@ -84,6 +84,8 @@ build gcc-4.7.4
build binutils-2.38
build musl-1.2.3
build gperf-3.1
build libunistring-0.9.10