From e1ca419046712b26a6040a917145f37da73fbd1a Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 22 Jun 2024 10:39:58 +0100 Subject: [PATCH] fix: don't use bash to call the builds allow them to infer from the shebang --- foundation/src/stages/stage1/bash/default.nix | 3 ++- foundation/src/stages/stage1/binutils/default.nix | 3 ++- foundation/src/stages/stage1/bison/default.nix | 3 ++- foundation/src/stages/stage1/coreutils/default.nix | 3 ++- foundation/src/stages/stage1/diffutils/default.nix | 3 ++- foundation/src/stages/stage1/findutils/default.nix | 3 ++- foundation/src/stages/stage1/gawk/boot.nix | 3 ++- foundation/src/stages/stage1/gawk/default.nix | 3 ++- foundation/src/stages/stage1/gcc/default.nix | 3 ++- foundation/src/stages/stage1/gcc/v4.6.cxx.nix | 3 ++- foundation/src/stages/stage1/gcc/v4.6.nix | 3 ++- foundation/src/stages/stage1/gcc/v8.nix | 3 ++- foundation/src/stages/stage1/gnum4/default.nix | 3 ++- foundation/src/stages/stage1/gnumake/default.nix | 3 ++- foundation/src/stages/stage1/gnutar/boot.nix | 3 ++- foundation/src/stages/stage1/gnutar/default.nix | 3 ++- foundation/src/stages/stage1/gnutar/musl.nix | 3 ++- foundation/src/stages/stage1/musl/boot.nix | 3 ++- foundation/src/stages/stage1/musl/default.nix | 3 ++- foundation/src/stages/stage1/python/default.nix | 3 ++- foundation/src/stages/stage1/xz/default.nix | 3 ++- foundation/src/stages/stage1/zlib/default.nix | 3 ++- foundation/src/stages/stage2/bash/default.nix | 3 ++- foundation/src/stages/stage2/binutils/default.nix | 3 ++- foundation/src/stages/stage2/coreutils/default.nix | 3 ++- foundation/src/stages/stage2/diffutils/default.nix | 3 ++- foundation/src/stages/stage2/findutils/default.nix | 3 ++- foundation/src/stages/stage2/gawk/default.nix | 3 ++- foundation/src/stages/stage2/gcc/default.nix | 3 ++- foundation/src/stages/stage2/glibc/default.nix | 3 ++- foundation/src/stages/stage2/gnugrep/default.nix | 3 ++- foundation/src/stages/stage2/gnumake/default.nix | 3 ++- foundation/src/stages/stage2/gnupatch/default.nix | 3 ++- foundation/src/stages/stage2/gnused/default.nix | 3 ++- foundation/src/stages/stage2/gnutar/default.nix | 3 ++- foundation/src/stages/stage2/gzip/default.nix | 3 ++- foundation/src/stages/stage2/patchelf/default.nix | 3 ++- 37 files changed, 74 insertions(+), 37 deletions(-) diff --git a/foundation/src/stages/stage1/bash/default.nix b/foundation/src/stages/stage1/bash/default.nix index 832d21f..f0c253b 100644 --- a/foundation/src/stages/stage1/bash/default.nix +++ b/foundation/src/stages/stage1/bash/default.nix @@ -109,7 +109,8 @@ in export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib" export AR="tcc -ar" export LD=tcc - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/binutils/default.nix b/foundation/src/stages/stage1/binutils/default.nix index d5f83d5..6170338 100644 --- a/foundation/src/stages/stage1/binutils/default.nix +++ b/foundation/src/stages/stage1/binutils/default.nix @@ -133,7 +133,8 @@ in export AR="tcc -ar" export lt_cv_sys_max_cmd_len=32768 export CFLAGS="-D__LITTLE_ENDIAN__=1" - bash ./configure ${builtins.concatStringsSep " " configureFlags} + chmod +x ./configure + ./configure ${builtins.concatStringsSep " " configureFlags} # Build make -j $NIX_BUILD_CORES all-libiberty all-gas all-bfd all-libctf all-zlib all-gprof diff --git a/foundation/src/stages/stage1/bison/default.nix b/foundation/src/stages/stage1/bison/default.nix index 22a75ad..65b2734 100644 --- a/foundation/src/stages/stage1/bison/default.nix +++ b/foundation/src/stages/stage1/bison/default.nix @@ -89,7 +89,8 @@ in cd bison-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/coreutils/default.nix b/foundation/src/stages/stage1/coreutils/default.nix index 019c4e4..1eb26b9 100644 --- a/foundation/src/stages/stage1/coreutils/default.nix +++ b/foundation/src/stages/stage1/coreutils/default.nix @@ -101,7 +101,8 @@ in # Configure export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib" export LD=tcc - bash ./configure ${builtins.concatStringsSep " " configureFlags} + chmod +x ./configure + ./configure ${builtins.concatStringsSep " " configureFlags} # Build make -j $NIX_BUILD_CORES AR="tcc -ar" MAKEINFO="true" diff --git a/foundation/src/stages/stage1/diffutils/default.nix b/foundation/src/stages/stage1/diffutils/default.nix index 55312c7..00a298b 100644 --- a/foundation/src/stages/stage1/diffutils/default.nix +++ b/foundation/src/stages/stage1/diffutils/default.nix @@ -90,7 +90,8 @@ in # Configure export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib" export LD=tcc - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} diff --git a/foundation/src/stages/stage1/findutils/default.nix b/foundation/src/stages/stage1/findutils/default.nix index 9161555..7b9fff7 100644 --- a/foundation/src/stages/stage1/findutils/default.nix +++ b/foundation/src/stages/stage1/findutils/default.nix @@ -95,7 +95,8 @@ in export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib" export AR="tcc -ar" export LD=tcc - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} diff --git a/foundation/src/stages/stage1/gawk/boot.nix b/foundation/src/stages/stage1/gawk/boot.nix index bd0abd8..e58c063 100644 --- a/foundation/src/stages/stage1/gawk/boot.nix +++ b/foundation/src/stages/stage1/gawk/boot.nix @@ -68,7 +68,8 @@ in export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib" export ac_cv_func_getpgrp_void=yes export ac_cv_func_tzset=yes - bash ./configure \ + chmod +x ./configure + ./configure \ --build=${platform.build} \ --host=${platform.host} \ --disable-nls \ diff --git a/foundation/src/stages/stage1/gawk/default.nix b/foundation/src/stages/stage1/gawk/default.nix index 35149ba..5e971a1 100644 --- a/foundation/src/stages/stage1/gawk/default.nix +++ b/foundation/src/stages/stage1/gawk/default.nix @@ -96,7 +96,8 @@ in export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib" export AR="tcc -ar" export LD=tcc - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} diff --git a/foundation/src/stages/stage1/gcc/default.nix b/foundation/src/stages/stage1/gcc/default.nix index f4e24c9..3601e9a 100644 --- a/foundation/src/stages/stage1/gcc/default.nix +++ b/foundation/src/stages/stage1/gcc/default.nix @@ -200,7 +200,8 @@ in export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so" export LIBRARY_PATH="${stage1.musl.package}/lib" - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/gcc/v4.6.cxx.nix b/foundation/src/stages/stage1/gcc/v4.6.cxx.nix index 459fde6..028e44f 100644 --- a/foundation/src/stages/stage1/gcc/v4.6.cxx.nix +++ b/foundation/src/stages/stage1/gcc/v4.6.cxx.nix @@ -162,7 +162,8 @@ in export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH" export LIBRARY_PATH="${stage1.musl.package}/lib" - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/gcc/v4.6.nix b/foundation/src/stages/stage1/gcc/v4.6.nix index 5568ac3..7dade6f 100644 --- a/foundation/src/stages/stage1/gcc/v4.6.nix +++ b/foundation/src/stages/stage1/gcc/v4.6.nix @@ -163,7 +163,8 @@ in export ac_cv_func_memcpy=yes export ac_cv_func_strerror=yes - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/gcc/v8.nix b/foundation/src/stages/stage1/gcc/v8.nix index c738289..0479de7 100644 --- a/foundation/src/stages/stage1/gcc/v8.nix +++ b/foundation/src/stages/stage1/gcc/v8.nix @@ -167,7 +167,8 @@ in export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH" export LIBRARY_PATH="${stage1.musl.package}/lib" - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/gnum4/default.nix b/foundation/src/stages/stage1/gnum4/default.nix index 613866e..bc0e412 100644 --- a/foundation/src/stages/stage1/gnum4/default.nix +++ b/foundation/src/stages/stage1/gnum4/default.nix @@ -88,7 +88,8 @@ in cd m4-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/gnumake/default.nix b/foundation/src/stages/stage1/gnumake/default.nix index fea1ac3..45f9912 100644 --- a/foundation/src/stages/stage1/gnumake/default.nix +++ b/foundation/src/stages/stage1/gnumake/default.nix @@ -104,7 +104,8 @@ in # Configure export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib" export LD=tcc - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} diff --git a/foundation/src/stages/stage1/gnutar/boot.nix b/foundation/src/stages/stage1/gnutar/boot.nix index df5d8a1..264a8de 100644 --- a/foundation/src/stages/stage1/gnutar/boot.nix +++ b/foundation/src/stages/stage1/gnutar/boot.nix @@ -58,7 +58,8 @@ in # Configure export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib" - bash ./configure \ + chmod +x ./configure + ./configure \ --build=${platform.build} \ --host=${platform.host} \ --disable-nls \ diff --git a/foundation/src/stages/stage1/gnutar/default.nix b/foundation/src/stages/stage1/gnutar/default.nix index 49aa968..7a9f0bc 100644 --- a/foundation/src/stages/stage1/gnutar/default.nix +++ b/foundation/src/stages/stage1/gnutar/default.nix @@ -98,7 +98,8 @@ in cd tar-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/gnutar/musl.nix b/foundation/src/stages/stage1/gnutar/musl.nix index b968384..d40c59c 100644 --- a/foundation/src/stages/stage1/gnutar/musl.nix +++ b/foundation/src/stages/stage1/gnutar/musl.nix @@ -59,7 +59,8 @@ in export ac_cv_sizeof_unsigned_long=4 export ac_cv_sizeof_long_long=8 export ac_cv_header_netdb_h=no - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/musl/boot.nix b/foundation/src/stages/stage1/musl/boot.nix index 9c1b8c7..a846790 100644 --- a/foundation/src/stages/stage1/musl/boot.nix +++ b/foundation/src/stages/stage1/musl/boot.nix @@ -118,7 +118,8 @@ in src/misc/wordexp.c # Configure - bash ./configure \ + chmod +x configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/musl/default.nix b/foundation/src/stages/stage1/musl/default.nix index 592c7a7..ea3cd1c 100644 --- a/foundation/src/stages/stage1/musl/default.nix +++ b/foundation/src/stages/stage1/musl/default.nix @@ -98,7 +98,8 @@ in src/misc/wordexp.c # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/python/default.nix b/foundation/src/stages/stage1/python/default.nix index 36a1902..d2e124f 100644 --- a/foundation/src/stages/stage1/python/default.nix +++ b/foundation/src/stages/stage1/python/default.nix @@ -107,7 +107,8 @@ in export C_INCLUDE_PATH="${stage1.zlib.package}/include" export LIBRARY_PATH="${stage1.zlib.package}/lib" export LD_LIBRARY_PATH="$LIBRARY_PATH" - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} diff --git a/foundation/src/stages/stage1/xz/default.nix b/foundation/src/stages/stage1/xz/default.nix index 5259fd0..6f5f90d 100644 --- a/foundation/src/stages/stage1/xz/default.nix +++ b/foundation/src/stages/stage1/xz/default.nix @@ -91,7 +91,8 @@ in export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib" export AR="tcc -ar" export LD=tcc - bash ./configure \ + chmod +x configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage1/zlib/default.nix b/foundation/src/stages/stage1/zlib/default.nix index d3f314d..5d8723a 100644 --- a/foundation/src/stages/stage1/zlib/default.nix +++ b/foundation/src/stages/stage1/zlib/default.nix @@ -86,7 +86,8 @@ in # Configure export CC=musl-gcc - bash ./configure --prefix=$out + chmod +x configure + ./configure --prefix=$out # Build make -j $NIX_BUILD_CORES diff --git a/foundation/src/stages/stage2/bash/default.nix b/foundation/src/stages/stage2/bash/default.nix index b66d5d3..5f8a2ca 100644 --- a/foundation/src/stages/stage2/bash/default.nix +++ b/foundation/src/stages/stage2/bash/default.nix @@ -97,7 +97,8 @@ in cd bash-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/binutils/default.nix b/foundation/src/stages/stage2/binutils/default.nix index 013842d..5323bc0 100644 --- a/foundation/src/stages/stage2/binutils/default.nix +++ b/foundation/src/stages/stage2/binutils/default.nix @@ -123,7 +123,8 @@ in ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches} # Configure - bash ./configure ${builtins.concatStringsSep " " configureFlags} + chmod +x ./configure + ./configure ${builtins.concatStringsSep " " configureFlags} # Build make -j $NIX_BUILD_CORES diff --git a/foundation/src/stages/stage2/coreutils/default.nix b/foundation/src/stages/stage2/coreutils/default.nix index 0d21bd6..aa8e3b6 100644 --- a/foundation/src/stages/stage2/coreutils/default.nix +++ b/foundation/src/stages/stage2/coreutils/default.nix @@ -102,7 +102,8 @@ in cd coreutils-${cfg.version} # Configure - bash ./configure ${builtins.concatStringsSep " " configureFlags} + chmod +x ./configure + ./configure ${builtins.concatStringsSep " " configureFlags} # Build make -j $NIX_BUILD_CORES diff --git a/foundation/src/stages/stage2/diffutils/default.nix b/foundation/src/stages/stage2/diffutils/default.nix index bf6a8d6..3138704 100644 --- a/foundation/src/stages/stage2/diffutils/default.nix +++ b/foundation/src/stages/stage2/diffutils/default.nix @@ -89,7 +89,8 @@ in cd diffutils-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/findutils/default.nix b/foundation/src/stages/stage2/findutils/default.nix index 5a2fdf8..09ef638 100644 --- a/foundation/src/stages/stage2/findutils/default.nix +++ b/foundation/src/stages/stage2/findutils/default.nix @@ -89,7 +89,8 @@ in cd findutils-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/gawk/default.nix b/foundation/src/stages/stage2/gawk/default.nix index 2a4f46d..24927ad 100644 --- a/foundation/src/stages/stage2/gawk/default.nix +++ b/foundation/src/stages/stage2/gawk/default.nix @@ -95,7 +95,8 @@ in cd gawk-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/gcc/default.nix b/foundation/src/stages/stage2/gcc/default.nix index e80b989..f4f0bc1 100644 --- a/foundation/src/stages/stage2/gcc/default.nix +++ b/foundation/src/stages/stage2/gcc/default.nix @@ -194,7 +194,8 @@ in export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so" export LIBRARY_PATH="${stage1.musl.package}/lib" - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/glibc/default.nix b/foundation/src/stages/stage2/glibc/default.nix index 7db5ae8..380670f 100644 --- a/foundation/src/stages/stage2/glibc/default.nix +++ b/foundation/src/stages/stage2/glibc/default.nix @@ -94,7 +94,8 @@ in cd build # libstdc++.so is built against musl and fails to link export CXX=false - bash ../configure \ + chmod +x ../configure + ../configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/gnugrep/default.nix b/foundation/src/stages/stage2/gnugrep/default.nix index 183d5dc..281f4a9 100644 --- a/foundation/src/stages/stage2/gnugrep/default.nix +++ b/foundation/src/stages/stage2/gnugrep/default.nix @@ -94,7 +94,8 @@ in cd grep-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/gnumake/default.nix b/foundation/src/stages/stage2/gnumake/default.nix index 384a94d..bddc9f6 100644 --- a/foundation/src/stages/stage2/gnumake/default.nix +++ b/foundation/src/stages/stage2/gnumake/default.nix @@ -105,7 +105,8 @@ in ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/gnupatch/default.nix b/foundation/src/stages/stage2/gnupatch/default.nix index dca9677..2453042 100644 --- a/foundation/src/stages/stage2/gnupatch/default.nix +++ b/foundation/src/stages/stage2/gnupatch/default.nix @@ -90,7 +90,8 @@ in cd patch-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/gnused/default.nix b/foundation/src/stages/stage2/gnused/default.nix index f23b834..be444cc 100644 --- a/foundation/src/stages/stage2/gnused/default.nix +++ b/foundation/src/stages/stage2/gnused/default.nix @@ -96,7 +96,8 @@ in cd sed-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/gnutar/default.nix b/foundation/src/stages/stage2/gnutar/default.nix index c2f4d86..fa1edce 100644 --- a/foundation/src/stages/stage2/gnutar/default.nix +++ b/foundation/src/stages/stage2/gnutar/default.nix @@ -95,7 +95,8 @@ in cd tar-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/gzip/default.nix b/foundation/src/stages/stage2/gzip/default.nix index e6f230e..501bde5 100644 --- a/foundation/src/stages/stage2/gzip/default.nix +++ b/foundation/src/stages/stage2/gzip/default.nix @@ -88,7 +88,8 @@ in cd gzip-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \ diff --git a/foundation/src/stages/stage2/patchelf/default.nix b/foundation/src/stages/stage2/patchelf/default.nix index fef5bb2..7f76022 100644 --- a/foundation/src/stages/stage2/patchelf/default.nix +++ b/foundation/src/stages/stage2/patchelf/default.nix @@ -89,7 +89,8 @@ in cd patchelf-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \