Skip to content

Commit 511dcaa

Browse files
committed
Build dynamic versions of musl, curl, openssl, zlib, libgcc & guile
This is required for the Guix bootstrap to work.
1 parent 14937ef commit 511dcaa

9 files changed

Lines changed: 13 additions & 13 deletions

File tree

steps/curl-8.12.1/pass2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ src_prepare() {
2020
}
2121

2222
src_configure() {
23-
LDFLAGS="-static" ./configure \
23+
./configure \
2424
--prefix="${PREFIX}" \
2525
--libdir="${LIBDIR}" \
2626
--build="${TARGET}" \

steps/gcc-10.5.0/pass1.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,13 @@ src_configure() {
173173
# For this GCC, we only build one stage, as extra is superfluous,
174174
# since we build GCC 12 straight after.
175175
CFLAGS="-std=gnu11" \
176-
LDFLAGS="-static" \
177176
../configure \
178177
--prefix="${PREFIX}" \
179178
--libdir="${LIBDIR}" \
180179
--build="${TARGET}" \
181180
--target="${TARGET}" \
182181
--host="${TARGET}" \
183182
--disable-bootstrap \
184-
--enable-static \
185183
--program-transform-name= \
186184
--enable-languages=c,c++ \
187185
--with-system-zlib \

steps/gcc-13.3.0/pass1.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,13 @@ src_configure() {
204204
mkdir build
205205
cd build
206206

207-
LDFLAGS="-static" \
208207
../configure \
209208
--prefix="${PREFIX}" \
210209
--libdir="${LIBDIR}" \
211210
--build="${TARGET}" \
212211
--target="${TARGET}" \
213212
--host="${TARGET}" \
214213
--enable-bootstrap \
215-
--enable-static \
216214
--disable-plugins \
217215
--disable-libssp \
218216
--disable-libsanitizer \
@@ -224,5 +222,5 @@ src_configure() {
224222
}
225223

226224
src_compile() {
227-
make "${MAKEJOBS}" BOOT_LDFLAGS="-static"
225+
make "${MAKEJOBS}"
228226
}

steps/gcc-4.7.4/pass1.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ src_configure() {
185185
--target="${TARGET}" \
186186
--host="${TARGET}" \
187187
--disable-shared \
188+
--disable-plugin \
188189
--program-transform-name= \
189190
--enable-languages=c,c++ \
190191
--disable-sjlj-exceptions \

steps/guile-3.0.9/pass1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ src_configure() {
5656
--prefix="${PREFIX}" \
5757
--libdir="${LIBDIR}" \
5858
--build="${TARGET}" \
59-
--disable-shared \
59+
--enable-shared \
6060
--disable-jit
6161
popd
6262
done

steps/musl-1.2.5/pass2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pass1.sh
1+
pass3.sh

steps/musl-1.2.5/pass3.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ src_configure() {
99
--host="${TARGET}" \
1010
--prefix="${PREFIX}" \
1111
--libdir="${LIBDIR}" \
12-
--includedir="${PREFIX}/include/"
12+
--includedir="${PREFIX}/include/" \
13+
--enable-static \
14+
--enable-shared
1315
}
1416

1517
src_compile() {
@@ -23,12 +25,13 @@ src_install() {
2325
rm "${DESTDIR}/lib/ld-musl-i386.so.1"
2426
rmdir "${DESTDIR}/lib"
2527
mkdir -p "${DESTDIR}${PREFIX}/lib"
26-
ln -sr "${DESTDIR}${LIBDIR}/libc.so" "${DESTDIR}${PREFIX}/lib/ld-musl-i386.so.1"
28+
ln -s "i386-unknown-linux-musl/libc.so" "${DESTDIR}${PREFIX}/lib/ld-musl-i386.so.1"
29+
ln -s "i386-unknown-linux-musl/libc.so" "${DESTDIR}${PREFIX}/lib/ld-linux.so.2"
2730

2831
# Make startup objects available in /usr/lib
2932
# Expected by GCC 10+
3033
for i in crt1.o crti.o crtn.o Scrt1.o rcrt1.o; do
31-
ln -sr "${DESTDIR}${LIBDIR}/${i}" "${DESTDIR}${PREFIX}/lib/${i}"
34+
ln -s "i386-unknown-linux-musl/${i}" "${DESTDIR}${PREFIX}/lib/${i}"
3235
done
3336

3437
# Add symlink for ldd

steps/openssl-3.0.13/pass1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ src_prepare() {
1616
src_configure() {
1717
./config --prefix="${PREFIX}" \
1818
--libdir="${LIBDIR}" \
19-
no-shared linux-generic32
19+
linux-generic32
2020
}
2121

2222
src_compile() {

steps/zlib-1.2.13/pass1.sh

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# SPDX-License-Identifier: GPL-3.0-or-later
44

55
src_configure() {
6-
./configure --prefix="${PREFIX}" --libdir="${LIBDIR}" --static
6+
./configure --prefix="${PREFIX}" --libdir="${LIBDIR}"
77
}

0 commit comments

Comments
 (0)