Skip to content

Commit 30bf5be

Browse files
fosslinuxfosslinux
authored
Merge pull request #529 from eduardosm/target-var
Define "TARGET" variable to avoid hardcoding "i386-unknown-linux-musl" everywhere
2 parents a7397d5 + 502e8f9 commit 30bf5be

37 files changed

Lines changed: 81 additions & 79 deletions

File tree

‎parts.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ tcc 0.9.27 (patched)
394394

395395
We recompile ``tcc`` with some patches needed to build musl.
396396

397-
musl 1.1.24 and musl_libdir
397+
musl 1.1.24 and musl_target
398398
===========================
399399

400400
``musl`` is a C standard library that is lightweight, fast, simple,

‎steps/SHA256SUMS.pkgs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fd65c11422588984bc3a440b1fd9d022307a200de182cfedfe3387a09cbece98 ca-certificate
3535
982a3496ce3277c562acc896ba796939fe55a37432b2c76ab16b76e051a045a2 coreutils-5.0_0.tar.bz2
3636
27f283c42e2728d0d0682d56ada44b11ff11d07843e595c133a43f4c6aef53d0 coreutils-6.10_0.tar.bz2
3737
22d4dcf97bc9caf36f2abc4fbfc2f40d13a0be2db2efce913b09a00461db7a06 coreutils-9.4_0.tar.bz2
38-
c0ab68a12ff82cb2b65b9c480281b70441ee14ef9bfe93605d1d5852379dbbaf curl-8.12.1_0.tar.bz2
38+
55435a61930f799a1a02f0a359081580b292c526f071aff3532170b3d9e37227 curl-8.12.1_0.tar.bz2
3939
ea841c92382860d3618368b86510514ed7d717c64625740e70baba2508e182c4 curl-8.12.1_1.tar.bz2
4040
fedf6ffbd37b14e9a0c94cd3063c6ac5d38f13be8a3399093ec112f9cd9d0816 dhcpcd-10.0.1_0.tar.bz2
4141
0462b6a04899a98d60c33f9d16fa00e2e6b7c21cc80ccebc8358fc08105467a2 diffutils-2.7_0.tar.bz2

‎steps/autogen-5.18.16/pass1.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ src_compile() {
4343
# Specify timeout to avoid non-reproducibility
4444
CPPFLAGS=-D_LARGEFILE64_SOURCE=1 ./configure \
4545
--prefix="${FINALPREFIX}" \
46-
--libdir="${FINALPREFIX}/lib/i386-unknown-linux-musl" \
46+
--libdir="${FINALPREFIX}/lib/${TARGET}" \
4747
--disable-shared \
4848
--enable-timeout=15
4949
touch doc/agdoc.texi # build later

‎steps/bash-5.2.15/pass1.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ src_configure() {
4141
./configure --prefix="${PREFIX}" \
4242
--without-bash-malloc \
4343
--disable-nls \
44-
--build=i386-unknown-linux-musl \
44+
--build="${TARGET}" \
4545
--enable-static-link \
4646
bash_cv_dev_stdin=absent \
4747
bash_cv_dev_fd=whacky

‎steps/bc-1.08.1/pass1.sh‎

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

2121
src_configure() {
2222
./configure --prefix="${PREFIX}" \
23-
--build=i386-unknown-linux-musl
23+
--build="${TARGET}"
2424
}
2525

2626
src_compile() {

‎steps/binutils-2.30/pass1.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ src_configure() {
121121
--disable-nls \
122122
--enable-deterministic-archives \
123123
--enable-64-bit-bfd \
124-
--build=i386-unknown-linux-gnu \
125-
--host=i386-unknown-linux-gnu \
126-
--target=i386-unknown-linux-gnu \
124+
--build="${TARGET/-musl/-gnu}" \
125+
--host="${TARGET/-musl/-gnu}" \
126+
--target="${TARGET/-musl/-gnu}" \
127127
--program-prefix="" \
128128
--prefix="${PREFIX}" \
129129
--libdir="${LIBDIR}" \
@@ -150,6 +150,6 @@ src_install() {
150150
# Create triplet symlinks
151151
cd "${DESTDIR}${PREFIX}/bin"
152152
for f in *; do
153-
ln -s "${PREFIX}/bin/${f}" "i386-unknown-linux-musl-${f}"
153+
ln -s "${PREFIX}/bin/${f}" "${TARGET}-${f}"
154154
done
155155
}

‎steps/binutils-2.41/pass1.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ src_configure() {
120120
--enable-install-libiberty \
121121
--enable-deterministic-archives \
122122
--with-system-zlib \
123-
--build=i386-unknown-linux-musl \
124-
--host=i386-unknown-linux-musl \
125-
--target=i386-unknown-linux-musl \
123+
--build="${TARGET}" \
124+
--host="${TARGET}" \
125+
--target="${TARGET}" \
126126
--program-prefix="" \
127127
--prefix="${PREFIX}" \
128128
--libdir="${LIBDIR}" \
@@ -147,7 +147,7 @@ src_install() {
147147
# Create triplet symlinks
148148
pushd "${DESTDIR}${PREFIX}/bin"
149149
for f in *; do
150-
ln -s "${PREFIX}/bin/${f}" "i386-unknown-linux-musl-${f}"
150+
ln -s "${PREFIX}/bin/${f}" "${TARGET}-${f}"
151151
done
152152
popd
153153

‎steps/binutils-2.41/pass2.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ src_configure() {
131131
../configure \
132132
--prefix="${PREFIX}" \
133133
--libdir="${LIBDIR}" \
134-
--build=i386-unknown-linux-musl \
135-
--host=i386-unknown-linux-musl \
136-
--target=i386-unknown-linux-musl \
134+
--build="${TARGET}" \
135+
--host="${TARGET}" \
136+
--target="${TARGET}" \
137137
--enable-static \
138138
--disable-nls \
139139
--disable-multilib \
@@ -157,7 +157,7 @@ src_install() {
157157
# Create triplet symlinks
158158
pushd "${DESTDIR}${PREFIX}/bin"
159159
for f in *; do
160-
ln -s "${PREFIX}/bin/${f}" "i386-unknown-linux-musl-${f}"
160+
ln -s "${PREFIX}/bin/${f}" "${TARGET}-${f}"
161161
done
162162
popd
163163

‎steps/coreutils-9.4/pass1.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ src_configure() {
4747
# Also, tell coreutils we don't have perl, which disables help2man
4848
FORCE_UNSAFE_CONFIGURE=1 ./configure CFLAGS="-static" \
4949
--prefix="${PREFIX}" \
50-
--build=i386-unknown-linux-musl \
50+
--build="${TARGET}" \
5151
gl_cv_func_getcwd_path_max="no, but it is partly working" \
5252
gl_cv_prog_perl="no"
5353
}

‎steps/curl-8.12.1/pass1.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ src_configure() {
3131
LDFLAGS="-static" ./configure \
3232
--prefix="${PREFIX}" \
3333
--libdir="${LIBDIR}" \
34-
--build=i386-unknown-linux-gnu \
34+
--build="${TARGET}" \
3535
--enable-ipv6 \
3636
--without-ssl \
3737
--without-libpsl \

0 commit comments

Comments
 (0)