mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-09 12:55:23 +01:00
Some shellcheck fixes.
This commit is contained in:
parent
ef0030bbf3
commit
6c4b98a17a
37 changed files with 90 additions and 93 deletions
|
|
@ -9,7 +9,7 @@ src_prepare() {
|
|||
|
||||
# Install autoconf data files into versioned directory
|
||||
for file in */*/Makefile.in */Makefile.in Makefile.in; do
|
||||
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
|
||||
sed -i '/^pkgdatadir/s:$:-@VERSION@:' "$file"
|
||||
done
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,7 @@ src_prepare() {
|
|||
autoreconf-2.69 -fi
|
||||
|
||||
# Install autoconf data files into versioned directory
|
||||
for file in Makefile.in; do
|
||||
sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
|
||||
done
|
||||
sed -i '/^pkgdatadir/s:$:-@VERSION@:' Makefile.in
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ regenerate_files() {
|
|||
# dependency.
|
||||
cp man/dummy-man man/help2man
|
||||
|
||||
VERSION=$(basename ${BASH_SOURCE[0]} .sh | sed 's/coreutils-//')
|
||||
echo $VERSION > .tarball-version
|
||||
VERSION=$(basename "${BASH_SOURCE[0]}" .sh | sed 's/coreutils-//')
|
||||
echo "$VERSION" > .tarball-version
|
||||
|
||||
# We don't have autopoint from gettext yet.
|
||||
AUTOPOINT=true autoreconf-2.69 -fi
|
||||
|
|
|
|||
|
|
@ -42,20 +42,20 @@ src_prepare() {
|
|||
# Regenerate configure scripts
|
||||
# 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)
|
||||
for dir in $(ls */configure | sed 's#/configure##' | tr "\n" " " | sed -e 's/ $/\n/' -e 's/^boehm-gc //'); do
|
||||
cd $dir
|
||||
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
|
||||
pushd "$dir"
|
||||
rm configure
|
||||
autoconf-2.64 || autoconf-2.64
|
||||
cd ..
|
||||
popd
|
||||
done
|
||||
|
||||
# Regenerate Makefile.in
|
||||
# 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
|
||||
cd $dir
|
||||
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
|
||||
pushd "$dir"
|
||||
rm Makefile.in
|
||||
AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 automake-1.11
|
||||
cd ..
|
||||
popd
|
||||
done
|
||||
|
||||
for dir in libdecnumber libcpp libiberty gcc; do
|
||||
|
|
@ -68,7 +68,7 @@ src_prepare() {
|
|||
# Rebuild libtool files
|
||||
rm config.guess config.sub ltmain.sh
|
||||
libtoolize
|
||||
cp "${PREFIX}/"/share/automake-1.15/config.sub .
|
||||
cp "${PREFIX}/share/automake-1.15/config.sub" .
|
||||
|
||||
# Workaround for bison being too new
|
||||
rm intl/plural.c
|
||||
|
|
@ -126,7 +126,7 @@ src_compile() {
|
|||
pushd order-a
|
||||
ar x ../.libs/libstdc++.a
|
||||
rm ../.libs/libstdc++.a
|
||||
ar cru ../.libs/libstdc++.a *.o
|
||||
ar cru ../.libs/libstdc++.a ./*.o
|
||||
popd
|
||||
popd
|
||||
}
|
||||
|
|
@ -135,7 +135,7 @@ src_install() {
|
|||
make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" MAKEINFO=true
|
||||
make -C build/libgcc install DESTDIR="${DESTDIR}" host_subdir=build
|
||||
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
|
||||
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/"
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ src_compile() {
|
|||
pushd libguile/.libs/order
|
||||
ar x ../libguile-3.0.a
|
||||
rm ../libguile-3.0.a
|
||||
ar cr ../libguile-3.0.a *.o
|
||||
ar cr ../libguile-3.0.a ./*.o
|
||||
popd
|
||||
|
||||
# Recompile guile with fixed libguile
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue