Some shellcheck fixes.

This commit is contained in:
Andrius Štikonas 2022-05-09 19:55:26 +01:00
parent ef0030bbf3
commit 6c4b98a17a
37 changed files with 90 additions and 93 deletions

View File

@ -15,7 +15,7 @@ src_compile() {
} }
src_install() { src_install() {
install -D autoconf ${DESTDIR}${PREFIX}/bin/autoconf-2.52 install -D autoconf "${DESTDIR}${PREFIX}/bin/autoconf-2.52"
mkdir -p ${DESTDIR}${PREFIX}/share/autoconf-2.52 mkdir -p "${DESTDIR}${PREFIX}/share/autoconf-2.52"
cp -r *.m4* ${DESTDIR}${PREFIX}/share/autoconf-2.52/ cp -r -- *.m4* "${DESTDIR}${PREFIX}/share/autoconf-2.52/"
} }

View File

@ -4,14 +4,14 @@
src_prepare() { src_prepare() {
rm doc/standards.info doc/autoconf.info rm doc/standards.info doc/autoconf.info
rm Makefile.in */Makefile.in rm -- Makefile.in */Makefile.in
rm configure rm configure
autoconf-2.52 autoconf-2.52
automake-1.4 automake-1.4
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */Makefile.in Makefile.in; do for file in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }
@ -25,8 +25,8 @@ src_compile() {
src_install() { src_install() {
# Remove manually installed autoconf # Remove manually installed autoconf
rm ${PREFIX}/bin/autoconf-2.52 rm "${PREFIX}/bin/autoconf-2.52"
rm -rf ${PREFIX}/share/autoconf-2.52 rm -rf "${PREFIX}/share/autoconf-2.52"
make install MAKEINFO=true DESTDIR="${DESTDIR}" make install MAKEINFO=true DESTDIR="${DESTDIR}"
} }

View File

@ -5,7 +5,7 @@
src_prepare() { src_prepare() {
default default
rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
rm doc/standards.info doc/autoconf.info rm doc/standards.info doc/autoconf.info
aclocal-1.6 aclocal-1.6
@ -19,7 +19,7 @@ src_prepare() {
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() { src_prepare() {
rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
rm doc/standards.info doc/autoconf.info rm doc/standards.info doc/autoconf.info
aclocal-1.6 aclocal-1.6
@ -13,7 +13,7 @@ src_prepare() {
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -4,7 +4,7 @@
src_prepare() { src_prepare() {
rm bin/autoconf.in rm bin/autoconf.in
rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
rm doc/standards.info doc/autoconf.info rm doc/standards.info doc/autoconf.info
aclocal-1.7 aclocal-1.7
sed -i 's/2.54/2.53/' aclocal.m4 sed -i 's/2.54/2.53/' aclocal.m4
@ -17,7 +17,7 @@ src_prepare() {
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -4,14 +4,14 @@
src_prepare() { src_prepare() {
rm bin/autoconf.in rm bin/autoconf.in
rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
rm doc/standards.info doc/autoconf.info rm doc/standards.info doc/autoconf.info
autoreconf-2.54 autoreconf-2.54
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -4,14 +4,14 @@
src_prepare() { src_prepare() {
rm bin/autoconf.in rm bin/autoconf.in
rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
rm doc/standards.info doc/autoconf.info rm doc/standards.info doc/autoconf.info
autoreconf-2.54 autoreconf-2.54
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -10,7 +10,7 @@ src_prepare() {
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -10,7 +10,7 @@ src_prepare() {
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -9,7 +9,7 @@ src_prepare() {
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -8,7 +8,7 @@ src_prepare() {
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -8,7 +8,7 @@ src_prepare() {
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() { src_prepare() {
rm configure Makefile.in */Makefile.in aclocal.m4 automake.info* rm -- configure Makefile.in */Makefile.in aclocal.m4 automake.info*
aclocal-1.6 aclocal-1.6
autoconf-2.52 autoconf-2.52
# When building with newer automake we get the following error # When building with newer automake we get the following error

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() { src_prepare() {
rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info* rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
cp aclocal.in aclocal cp aclocal.in aclocal
cp m4/amversion.in m4/amversion.m4 cp m4/amversion.in m4/amversion.m4
} }

View File

@ -6,7 +6,7 @@
src_prepare() { src_prepare() {
sed -i '/Makefile/d' configure.in sed -i '/Makefile/d' configure.in
rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info* rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
aclocal-1.6 aclocal-1.6
autoconf-2.52 autoconf-2.52
} }

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() { src_prepare() {
rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info* rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
aclocal-1.6 aclocal-1.6
autoconf-2.52 autoconf-2.52
automake-1.6 automake-1.6

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() { src_prepare() {
rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info* rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
autoreconf-2.55 autoreconf-2.55
} }

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() { src_prepare() {
rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info* rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
sed -i -e 's/2.54/2.53/' -e '/AC_PROG_EGREP/d' -e '/AC_PROG_FGREP/d' configure.in sed -i -e 's/2.54/2.53/' -e '/AC_PROG_EGREP/d' -e '/AC_PROG_FGREP/d' configure.in
aclocal-1.6 aclocal-1.6
autoconf-2.53 autoconf-2.53

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() { src_prepare() {
rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info* rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info*
autoreconf-2.54 autoreconf-2.54
} }

View File

@ -72,7 +72,7 @@ src_prepare() {
done done
# Rebuild bison files # Rebuild bison files
touch */*.y touch -- */*.y
rm ld/ldgram.c ld/ldgram.h rm ld/ldgram.c ld/ldgram.h
rm gas/itbl-parse.c gas/itbl-parse.h rm gas/itbl-parse.c gas/itbl-parse.h
rm gas/m68k-parse.c rm gas/m68k-parse.c
@ -83,13 +83,13 @@ src_prepare() {
rm binutils/rcparse.c binutils/rcparse.h rm binutils/rcparse.c binutils/rcparse.h
# Rebuild flex generated files # Rebuild flex generated files
touch */*.l touch -- */*.l
rm ld/ldlex.c rm ld/ldlex.c
rm gas/itbl-lex.c rm gas/itbl-lex.c
rm binutils/syslex.c binutils/rclex.c binutils/deflex.c binutils/arlex.c rm binutils/syslex.c binutils/rclex.c binutils/deflex.c binutils/arlex.c
# Remove prebuilt texinfo files # Remove prebuilt texinfo files
rm */*.info* */*/*.info* rm -- */*.info* */*/*.info*
} }
src_configure() { src_configure() {

View File

@ -14,8 +14,8 @@ src_compile() {
src_install() { src_install() {
# Manually install bzip2 (cannot replace binary while running) # Manually install bzip2 (cannot replace binary while running)
install -D bzip2 ${PREFIX}/bin/bzip2 install -D bzip2 "${PREFIX}/bin/bzip2"
mkdir -p ${DESTDIR}${PREFIX}/bin mkdir -p "${DESTDIR}${PREFIX}/bin"
ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bunzip2 ln -sf "${PREFIX}/bin/bzip2" "${DESTDIR}${PREFIX}/bin/bunzip2"
ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bzcat ln -sf "${PREFIX}/bin/bzip2" "${DESTDIR}${PREFIX}/bin/bzcat"
} }

View File

@ -22,6 +22,6 @@ src_install() {
cd .. cd ..
# Remove yacc, we won't need it any longer # Remove yacc, we won't need it any longer
rm ${PREFIX}/bin/yacc rm "${PREFIX}/bin/yacc"
rm /yaccpar rm /yaccpar
} }

View File

@ -94,5 +94,5 @@ src_compile() {
src_install() { src_install() {
mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include" mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include"
make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}"
cp gcc/gsyslimits.h ${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h cp gcc/gsyslimits.h "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h"
} }

View File

@ -16,7 +16,7 @@ src_prepare() {
} }
src_configure() { src_configure() {
./configure --prefix=${PREFIX} ./configure --prefix="${PREFIX}"
} }
src_compile() { src_compile() {
@ -26,5 +26,5 @@ src_compile() {
} }
src_install() { src_install() {
make MAKEINFO=true DESTDIR=${DESTDIR} install make MAKEINFO=true DESTDIR="${DESTDIR}" install
} }

View File

@ -1,4 +1,5 @@
# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
@ -9,6 +10,6 @@ src_prepare() {
} }
src_configure() { src_configure() {
./configure --prefix=${PREFIX} \ ./configure --prefix="${PREFIX}" \
--sbindir="${PREFIX}/bin" --sbindir="${PREFIX}/bin"
} }

View File

@ -8,7 +8,7 @@ src_unpack() {
mv "${DISTFILES}/deblob-4.9" "${pkg}/" mv "${DISTFILES}/deblob-4.9" "${pkg}/"
# Remove all previous source tarballs # Remove all previous source tarballs
mv "${DISTFILES}/${pkg}.tar.gz" . mv "${DISTFILES}/${pkg}.tar.gz" .
rm -r "${DISTFILES}/"* rm -r "${DISTFILES:?}/"*
mv "${pkg}.tar.gz" "${DISTFILES}" mv "${pkg}.tar.gz" "${DISTFILES}"
default || true # Predictable link errors - not a problem default || true # Predictable link errors - not a problem
rm -r "${DISTFILES}" # Clear storage space rm -r "${DISTFILES}" # Clear storage space

View File

@ -56,7 +56,7 @@ src_install() {
VERSION=5 VERSION=5
PATCHLEVEL=10 PATCHLEVEL=10
SUBLEVEL=42 SUBLEVEL=42
VERSION_CODE="$((${VERSION} * 65536 + ${PATCHLEVEL} * 256 + ${SUBLEVEL}))" VERSION_CODE="$((VERSION * 65536 + PATCHLEVEL * 256 + SUBLEVEL))"
echo '#define LINUX_VERSION_CODE '"${VERSION_CODE}" \ echo '#define LINUX_VERSION_CODE '"${VERSION_CODE}" \
> "${DESTDIR}${PREFIX}/include/linux/version.h" > "${DESTDIR}${PREFIX}/include/linux/version.h"
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))' \ echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))' \

View File

@ -2,8 +2,6 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
SRCS="musl-1.2.2.tar.gz"
src_configure() { src_configure() {
CC=gcc ./configure \ CC=gcc ./configure \
--host=i386-unknown-linux-musl \ --host=i386-unknown-linux-musl \

View File

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
@ -14,7 +14,7 @@ src_compile() {
export incdir=${PREFIX}/include/musl export incdir=${PREFIX}/include/musl
export bindir=${PREFIX}/bin export bindir=${PREFIX}/bin
mkdir -p ${libdir}/tcc mkdir -p "${libdir}/tcc"
# We first have to recompile using tcc-0.9.26 as tcc-0.9.27 is not self-hosting, # We first have to recompile using tcc-0.9.26 as tcc-0.9.27 is not self-hosting,
# but when linked with musl it is. # but when linked with musl it is.
@ -24,12 +24,12 @@ src_compile() {
-static \ -static \
-o tcc-musl \ -o tcc-musl \
-D TCC_TARGET_I386=1 \ -D TCC_TARGET_I386=1 \
-D CONFIG_TCCDIR=\"${libdir}/tcc\" \ -D CONFIG_TCCDIR=\""${libdir}/tcc"\" \
-D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \ -D CONFIG_TCC_CRTPREFIX=\""${libdir}"\" \
-D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \ -D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \
-D CONFIG_TCC_LIBPATHS=\"${libdir}:${libdir}/tcc\" \ -D CONFIG_TCC_LIBPATHS=\""${libdir}:${libdir}/tcc"\" \
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${incdir}\" \ -D CONFIG_TCC_SYSINCLUDEPATHS=\""${incdir}"\" \
-D TCC_LIBGCC=\"${libdir}/libc.a\" \ -D TCC_LIBGCC=\""${libdir}/libc.a"\" \
-D CONFIG_TCC_STATIC=1 \ -D CONFIG_TCC_STATIC=1 \
-D CONFIG_USE_LIBGCC=1 \ -D CONFIG_USE_LIBGCC=1 \
-D TCC_VERSION=\"0.9.27\" \ -D TCC_VERSION=\"0.9.27\" \
@ -38,14 +38,14 @@ src_compile() {
# libtcc1.a # libtcc1.a
${TCC} -c -D HAVE_CONFIG_H=1 lib/libtcc1.c ${TCC} -c -D HAVE_CONFIG_H=1 lib/libtcc1.c
${TCC} -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o ${TCC} -ar cr "${libdir}/tcc/libtcc1.a" libtcc1.o
done done
} }
src_install() { src_install() {
# Remove old tcc binaries # Remove old tcc binaries
rm ${bindir}/tcc rm "${bindir}/tcc"
rm ${bindir}/boot*-tcc ${bindir}/tcc-0.9.26 ${bindir}/mes-tcc rm "${bindir}"/boot*-tcc "${bindir}/tcc-0.9.26" "${bindir}/mes-tcc"
install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl install -D tcc-musl "${DESTDIR}${bindir}/tcc-musl"
ln -s tcc-musl ${DESTDIR}${bindir}/tcc ln -s tcc-musl "${DESTDIR}${bindir}/tcc"
} }

View File

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
@ -14,19 +14,19 @@ src_compile() {
export incdir=${PREFIX}/include/musl export incdir=${PREFIX}/include/musl
export bindir=${PREFIX}/bin export bindir=${PREFIX}/bin
mkdir -p ${libdir}/tcc mkdir -p "${libdir}/tcc"
tcc-musl \ tcc-musl \
-v \ -v \
-static \ -static \
-o tcc-musl \ -o tcc-musl \
-D TCC_TARGET_I386=1 \ -D TCC_TARGET_I386=1 \
-D CONFIG_TCCDIR=\"${libdir}/tcc\" \ -D CONFIG_TCCDIR=\""${libdir}/tcc"\" \
-D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \ -D CONFIG_TCC_CRTPREFIX=\""${libdir}"\" \
-D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \ -D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \
-D CONFIG_TCC_LIBPATHS=\"${libdir}:${libdir}/tcc\" \ -D CONFIG_TCC_LIBPATHS=\""${libdir}:${libdir}/tcc"\" \
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${incdir}\" \ -D CONFIG_TCC_SYSINCLUDEPATHS=\""${incdir}"\" \
-D TCC_LIBGCC=\"${libdir}/libc.a\" \ -D TCC_LIBGCC=\""${libdir}/libc.a"\" \
-D CONFIG_TCC_STATIC=1 \ -D CONFIG_TCC_STATIC=1 \
-D CONFIG_USE_LIBGCC=1 \ -D CONFIG_USE_LIBGCC=1 \
-D TCC_VERSION=\"0.9.27\" \ -D TCC_VERSION=\"0.9.27\" \
@ -39,6 +39,6 @@ src_compile() {
} }
src_install() { src_install() {
install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl install -D tcc-musl "${DESTDIR}${bindir}/tcc-musl"
install -D -m 644 libtcc1.a ${DESTDIR}${libdir}/libtcc1.a install -D -m 644 libtcc1.a "${DESTDIR}${libdir}/libtcc1.a"
} }

View File

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space> # SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
@ -14,24 +14,24 @@ src_compile() {
export incdir=${PREFIX}/include export incdir=${PREFIX}/include
export bindir=${PREFIX}/bin export bindir=${PREFIX}/bin
mkdir -p ${libdir}/tcc mkdir -p "${libdir}/tcc"
tcc-musl \ tcc-musl \
-v \ -v \
-static \ -static \
-o tcc-musl \ -o tcc-musl \
-D TCC_TARGET_I386=1 \ -D TCC_TARGET_I386=1 \
-D CONFIG_TCCDIR=\"${libdir}/tcc\" \ -D CONFIG_TCCDIR=\""${libdir}/tcc"\" \
-D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \ -D CONFIG_TCC_CRTPREFIX=\""${libdir}"\" \
-D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \ -D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \
-D CONFIG_TCC_LIBPATHS=\"${libdir}:${libdir}/tcc\" \ -D CONFIG_TCC_LIBPATHS=\""${libdir}:${libdir}/tcc"\" \
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${incdir}\" \ -D CONFIG_TCC_SYSINCLUDEPATHS=\""${incdir}"\" \
-D TCC_LIBGCC=\"${libdir}/libc.a\" \ -D TCC_LIBGCC=\""${libdir}/libc.a"\" \
-D CONFIG_TCC_STATIC=1 \ -D CONFIG_TCC_STATIC=1 \
-D CONFIG_USE_LIBGCC=1 \ -D CONFIG_USE_LIBGCC=1 \
-D TCC_VERSION=\"0.9.27\" \ -D TCC_VERSION=\"0.9.27\" \
-D ONE_SOURCE=1 \ -D ONE_SOURCE=1 \
-I ${incdir} \ -I "${incdir}" \
tcc.c tcc.c
# libtcc1.a # libtcc1.a
@ -40,6 +40,6 @@ src_compile() {
} }
src_install() { src_install() {
install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl install -D tcc-musl "${DESTDIR}${bindir}/tcc-musl"
install -D -m 644 libtcc1.a ${DESTDIR}${libdir}/libtcc1.a install -D -m 644 libtcc1.a "${DESTDIR}${libdir}/libtcc1.a"
} }

View File

@ -10,7 +10,7 @@ src_prepare() {
} }
src_configure() { src_configure() {
./configure --prefix=${PREFIX} \ ./configure --prefix="${PREFIX}" \
--bindir="${PREFIX}/bin" \ --bindir="${PREFIX}/bin" \
--sbindir="${PREFIX}/bin" \ --sbindir="${PREFIX}/bin" \
--libdir="${PREFIX}/lib/musl" \ --libdir="${PREFIX}/lib/musl" \

View File

@ -9,7 +9,7 @@ src_prepare() {
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in */*/Makefile.in */Makefile.in Makefile.in; do for file in */*/Makefile.in */Makefile.in Makefile.in; do
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
done done
} }

View File

@ -7,9 +7,7 @@ src_prepare() {
autoreconf-2.69 -fi autoreconf-2.69 -fi
# Install autoconf data files into versioned directory # Install autoconf data files into versioned directory
for file in Makefile.in; do sed -i '/^pkgdatadir/s:$:-@VERSION@:' Makefile.in
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
done
} }
src_configure() { src_configure() {

View File

@ -18,8 +18,8 @@ regenerate_files() {
# dependency. # dependency.
cp man/dummy-man man/help2man cp man/dummy-man man/help2man
VERSION=$(basename ${BASH_SOURCE[0]} .sh | sed 's/coreutils-//') VERSION=$(basename "${BASH_SOURCE[0]}" .sh | sed 's/coreutils-//')
echo $VERSION > .tarball-version echo "$VERSION" > .tarball-version
# We don't have autopoint from gettext yet. # We don't have autopoint from gettext yet.
AUTOPOINT=true autoreconf-2.69 -fi AUTOPOINT=true autoreconf-2.69 -fi

View File

@ -42,20 +42,20 @@ src_prepare() {
# Regenerate configure scripts # Regenerate configure scripts
# Find all folders with configure script and rebuild them. At the moment we exclude boehm-gc folder due to # Find all folders with configure script and rebuild them. At the moment we exclude boehm-gc folder due to
# an error but we don't use that directory anyway (it's only needed for Objective C) # an error but we don't use that directory anyway (it's only needed for Objective C)
for dir in $(ls */configure | sed 's#/configure##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do for dir in $(find . -mindepth 2 -maxdepth 2 -name configure.ac | sed 's#/configure.ac##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do
cd $dir pushd "$dir"
rm configure rm configure
autoconf-2.64 || autoconf-2.64 autoconf-2.64 || autoconf-2.64
cd .. popd
done done
# Regenerate Makefile.in # Regenerate Makefile.in
# Find all folders with Makefile.am and rebuild them. At the moment we exclude boehm-gc folder. # Find all folders with Makefile.am and rebuild them. At the moment we exclude boehm-gc folder.
for dir in $(ls */Makefile.am | sed 's#/Makefile.am##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do for dir in $(find . -mindepth 2 -maxdepth 2 -name Makefile.am | sed 's#/Makefile.am##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do
cd $dir pushd "$dir"
rm Makefile.in rm Makefile.in
AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 automake-1.11 AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 automake-1.11
cd .. popd
done done
for dir in libdecnumber libcpp libiberty gcc; do for dir in libdecnumber libcpp libiberty gcc; do
@ -68,7 +68,7 @@ src_prepare() {
# Rebuild libtool files # Rebuild libtool files
rm config.guess config.sub ltmain.sh rm config.guess config.sub ltmain.sh
libtoolize libtoolize
cp "${PREFIX}/"/share/automake-1.15/config.sub . cp "${PREFIX}/share/automake-1.15/config.sub" .
# Workaround for bison being too new # Workaround for bison being too new
rm intl/plural.c rm intl/plural.c
@ -126,7 +126,7 @@ src_compile() {
pushd order-a pushd order-a
ar x ../.libs/libstdc++.a ar x ../.libs/libstdc++.a
rm ../.libs/libstdc++.a rm ../.libs/libstdc++.a
ar cru ../.libs/libstdc++.a *.o ar cru ../.libs/libstdc++.a ./*.o
popd popd
popd popd
} }
@ -135,7 +135,7 @@ src_install() {
make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" MAKEINFO=true make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" MAKEINFO=true
make -C build/libgcc install DESTDIR="${DESTDIR}" host_subdir=build make -C build/libgcc install DESTDIR="${DESTDIR}" host_subdir=build
make -C build/libstdc++-v3 install DESTDIR="${DESTDIR}" make -C build/libstdc++-v3 install DESTDIR="${DESTDIR}"
cp gcc/gsyslimits.h ${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/syslimits.h cp gcc/gsyslimits.h "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/syslimits.h"
# Very strange mis-versoning error # Very strange mis-versoning error
mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/" mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/"
mv "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/"* "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/" mv "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/"* "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.7.4/include/"

View File

@ -67,7 +67,7 @@ src_compile() {
pushd libguile/.libs/order pushd libguile/.libs/order
ar x ../libguile-3.0.a ar x ../libguile-3.0.a
rm ../libguile-3.0.a rm ../libguile-3.0.a
ar cr ../libguile-3.0.a *.o ar cr ../libguile-3.0.a ./*.o
popd popd
# Recompile guile with fixed libguile # Recompile guile with fixed libguile