From 6d83390aef9fec582c2989703e54e696d76555c7 Mon Sep 17 00:00:00 2001 From: ag-tsotetsi Date: Sat, 7 Feb 2026 20:53:40 +0200 Subject: [PATCH] fixed issue with directory name having spacing in name --- build.bash | 2 +- build/binutils/build.bash | 10 +++++----- build/gcc/build.bash | 20 ++++++++++---------- build/glibc/build.bash | 14 +++++++------- build/libstdc++/build.bash | 10 +++++----- build/linux/build.bash | 8 ++++---- config/global.env | 11 +++++------ config/utilities.bash | 12 ++++++------ 8 files changed, 43 insertions(+), 44 deletions(-) diff --git a/build.bash b/build.bash index c176ddc..81b6ded 100755 --- a/build.bash +++ b/build.bash @@ -7,7 +7,7 @@ umask 022 . config/utilities.bash -if [ ! -d $SYSROOT ]; then +if [ ! -d "$SYSROOT" ]; then create_sysroot fi diff --git a/build/binutils/build.bash b/build/binutils/build.bash index 575dbe7..7ffe7bc 100644 --- a/build/binutils/build.bash +++ b/build/binutils/build.bash @@ -1,16 +1,16 @@ -. $PROJECTDIR/build/binutils/package.env +. "$PROJECTDIR/build/binutils/package.env" fetch $BINUTILS_URL -cd $SOURCES && tar xf binutils-$BINUTILS_VERSION.tar.xz && cd binutils-$BINUTILS_VERSION +cd "$SOURCES" && tar xf binutils-$BINUTILS_VERSION.tar.xz && cd binutils-$BINUTILS_VERSION bootstrap() { mkdir -p build && cd build ../configure \ - --prefix=$SYSROOT/tools \ - --with-sysroot=$SYSROOT \ + --prefix="$SYSROOT/tools" \ + --with-sysroot="$SYSROOT" \ --target=$TARGET \ --disable-nls \ --enable-gprofng=no \ @@ -50,4 +50,4 @@ case $1 in esac -cd $SOURCES && rm -rf $SOURCES/binutils-$BINUTILS_VERSION +cd "$SOURCES" && rm -rf "$SOURCES/binutils-$BINUTILS_VERSION" \ No newline at end of file diff --git a/build/gcc/build.bash b/build/gcc/build.bash index d8b0e03..81beeea 100644 --- a/build/gcc/build.bash +++ b/build/gcc/build.bash @@ -1,8 +1,8 @@ -. $PROJECTDIR/build/gcc/package.env -. $PROJECTDIR/build/gmp/package.env -. $PROJECTDIR/build/isl/package.env -. $PROJECTDIR/build/mpc/package.env -. $PROJECTDIR/build/mpfr/package.env +. "$PROJECTDIR/build/gcc/package.env" +. "$PROJECTDIR/build/gmp/package.env" +. "$PROJECTDIR/build/isl/package.env" +. "$PROJECTDIR/build/mpc/package.env" +. "$PROJECTDIR/build/mpfr/package.env" fetch $GCC_URL fetch $GMP_URL @@ -10,7 +10,7 @@ fetch $ISL_URL fetch $MPC_URL fetch $MPFR_URL -cd $SOURCES && tar xf gcc-$GCC_VERSION.tar.xz && cd gcc-$GCC_VERSION +cd "$SOURCES" && tar xf gcc-$GCC_VERSION.tar.xz && cd gcc-$GCC_VERSION bootstrap() { @@ -25,9 +25,9 @@ bootstrap() { ../configure \ --target=$TARGET \ - --prefix=$SYSROOT/cross \ + --prefix="$SYSROOT/cross" \ --with-glibc-version=2.43 \ - --with-sysroot=$SYSROOT \ + --with-sysroot="$SYSROOT" \ --with-newlib \ --without-headers \ --enable-default-pie \ @@ -47,7 +47,7 @@ bootstrap() { make > /dev/null && make install > /dev/null cd .. - cat gcc/limitx.h gcc/glimits.h gcc/limity.h > `dirname $($TARGET-gcc -print-libgcc-file-name)`/include/limits.h + cat gcc/limitx.h gcc/glimits.h gcc/limity.h > "`dirname $($TARGET-gcc -print-libgcc-file-name)`/include/limits.h" } @@ -79,4 +79,4 @@ case $1 in esac -cd $SOURCES && rm -rf $SOURCES/gcc-$GCC_VERSION +cd "$SOURCES" && rm -rf "$SOURCES/gcc-$GCC_VERSION" diff --git a/build/glibc/build.bash b/build/glibc/build.bash index e82dcf3..7acc341 100644 --- a/build/glibc/build.bash +++ b/build/glibc/build.bash @@ -1,16 +1,16 @@ -. $PROJECTDIR/build/glibc/package.env +. "$PROJECTDIR/build/glibc/package.env" fetch $GLIBC_URL fetch https://www.linuxfromscratch.org/patches/lfs/development/glibc-fhs-1.patch -cd $SOURCES && tar xf glibc-$GLIBC_VERSION.tar.xz && cd glibc-$GLIBC_VERSION +cd "$SOURCES" && tar xf glibc-$GLIBC_VERSION.tar.xz && cd glibc-$GLIBC_VERSION bootstrap() { - ln -sf ld-linux-x86-64.so.2 $SYSROOT/lib/ld-lsb-x86-64.so.3 + ln -sf ld-linux-x86-64.so.2 "$SYSROOT/lib/ld-lsb-x86-64.so.3" - patch -Np1 -i $SOURCES/glibc-fhs-1.patch + patch -Np1 -i "$SOURCES/glibc-fhs-1.patch" mkdir -p build && cd build @@ -24,9 +24,9 @@ bootstrap() { libc_cv_slibdir=/usr/lib \ --enable-kernel=6.0 > /dev/null - make > /dev/null && make DESTDIR=$SYSROOT install > /dev/null + make > /dev/null && make DESTDIR="$SYSROOT" install > /dev/null - sed '/RTLDLIST=/s@/usr@@g' -i $SYSROOT/usr/bin/ldd + sed '/RTLDLIST=/s@/usr@@g' -i "$SYSROOT/usr/bin/ldd" } @@ -58,4 +58,4 @@ case $1 in esac -cd $SOURCES && rm -rf $SOURCES/glibc-$GLIBC_VERSION +cd "$SOURCES" && rm -rf "$SOURCES/glibc-$GLIBC_VERSION" diff --git a/build/libstdc++/build.bash b/build/libstdc++/build.bash index a85a3e2..01ecb77 100644 --- a/build/libstdc++/build.bash +++ b/build/libstdc++/build.bash @@ -1,8 +1,8 @@ -. $PROJECTDIR/build/gcc/package.env +. "$PROJECTDIR/build/gcc/package.env" fetch $GCC_URL -cd $SOURCES && tar xf gcc-$GCC_VERSION.tar.xz && cd gcc-$GCC_VERSION +cd "$SOURCES" && tar xf gcc-$GCC_VERSION.tar.xz && cd gcc-$GCC_VERSION bootstrap() { mkdir -p build && cd build @@ -16,9 +16,9 @@ bootstrap() { --disable-libstdcxx-pch \ --with-gxx-include-dir=/cross/$TARGET/include/c++/$GCC_VERSION > /dev/null - make > /dev/null && make DESTDIR=$SYSROOT install > /dev/null + make > /dev/null && make DESTDIR="$SYSROOT" install > /dev/null - rm $SYSROOT/usr/lib/lib{stdc++{,exp,fs},supc++}.la + rm "$SYSROOT/usr/lib/lib{stdc++{,exp,fs},supc++}.la" } @@ -49,4 +49,4 @@ case $1 in ;; esac -cd $SOURCES && rm -rf $SOURCES/gcc-$GCC_VERSION +cd "$SOURCES" && rm -rf "$SOURCES/gcc-$GCC_VERSION" diff --git a/build/linux/build.bash b/build/linux/build.bash index cd64632..c738b1f 100644 --- a/build/linux/build.bash +++ b/build/linux/build.bash @@ -1,15 +1,15 @@ -. $PROJECTDIR/build/linux/package.env +. "$PROJECTDIR/build/linux/package.env" fetch $LINUX_URL -cd $SOURCES && tar xf linux-$LINUX_VERSION.tar.xz && cd linux-$LINUX_VERSION +cd "$SOURCES" && tar xf linux-$LINUX_VERSION.tar.xz && cd linux-$LINUX_VERSION make mrproper bootstrap() { make headers find usr/include -type f ! -name '*.h' -delete - cp -r usr/include $SYSROOT/usr + cp -r usr/include "$SYSROOT/usr" } toolchain() { @@ -40,4 +40,4 @@ case $1 in esac -cd $SOURCES && rm -rf $SOURCES/linux-$LINUX_VERSION +cd "$SOURCES" && rm -rf "$SOURCES/linux-$LINUX_VERSION" diff --git a/config/global.env b/config/global.env index 0c197e4..5f5eaa3 100644 --- a/config/global.env +++ b/config/global.env @@ -1,10 +1,9 @@ -export SYSROOT=$PWD/sysroot +export SYSROOT="$PWD/sysroot" export MAKEFLAGS=-j$(nproc) export LC_ALL=POSIX export TARGET=x86_64-axe-linux-gnu -export SOURCES=$PWD/sources -export BUILD=$PWD/build -export PATH=$SYSROOT/cross/bin:/usr/bin:/usr/sbin -export CONFIG_SITE=$SYSROOT/usr/share/config.site -export PROJECTDIR=$PWD \ No newline at end of file +export SOURCES="$PWD/sources" +export PATH="$SYSROOT/cross/bin:/usr/bin:/usr/sbin" +export CONFIG_SITE="$SYSROOT/usr/share/config.site" +export PROJECTDIR="$PWD" \ No newline at end of file diff --git a/config/utilities.bash b/config/utilities.bash index db0ba66..73104f1 100644 --- a/config/utilities.bash +++ b/config/utilities.bash @@ -1,18 +1,18 @@ fetch() { - wget -N -c --show-progress -q -P $SOURCES $1 + wget -N -c --show-progress -q -P "$SOURCES" $1 } create_sysroot() { - mkdir -p $SYSROOT/{etc,cross,usr} - mkdir -p $SYSROOT/usr/{bin,sbin,lib,include} + mkdir -p "$SYSROOT/{etc,cross,usr}" + mkdir -p "$SYSROOT/usr/{bin,sbin,lib,include}" for directory in bin sbin lib; do - ln -fs usr/$directory $SYSROOT/$directory + ln -fs "usr/$directory" "$SYSROOT/$directory" done - ln -fs lib $SYSROOT/usr/lib64 - ln -fs usr/lib64 $SYSROOT/lib64 + ln -fs lib "$SYSROOT/usr/lib64" + ln -fs usr/lib64 "$SYSROOT/lib64" } \ No newline at end of file