From 786738b368998e6b8a1a60ff0b93af6e4679475c 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 2e0b319..ff00cbf 100644 --- a/foundation/src/stages/stage1/bash/default.nix +++ b/foundation/src/stages/stage1/bash/default.nix @@ -106,7 +106,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 cbe9333..039b37c 100644 --- a/foundation/src/stages/stage1/binutils/default.nix +++ b/foundation/src/stages/stage1/binutils/default.nix @@ -130,7 +130,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 711f85e..c11c0a2 100644 --- a/foundation/src/stages/stage1/bison/default.nix +++ b/foundation/src/stages/stage1/bison/default.nix @@ -86,7 +86,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 a3390e7..631a5c4 100644 --- a/foundation/src/stages/stage1/coreutils/default.nix +++ b/foundation/src/stages/stage1/coreutils/default.nix @@ -98,7 +98,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 c3903ea..33992cf 100644 --- a/foundation/src/stages/stage1/diffutils/default.nix +++ b/foundation/src/stages/stage1/diffutils/default.nix @@ -87,7 +87,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 30eb797..ad2f5c5 100644 --- a/foundation/src/stages/stage1/findutils/default.nix +++ b/foundation/src/stages/stage1/findutils/default.nix @@ -92,7 +92,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 0ac0583..f236223 100644 --- a/foundation/src/stages/stage1/gawk/default.nix +++ b/foundation/src/stages/stage1/gawk/default.nix @@ -93,7 +93,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 93f91d9..f1ff036 100644 --- a/foundation/src/stages/stage1/gcc/default.nix +++ b/foundation/src/stages/stage1/gcc/default.nix @@ -197,7 +197,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 35482a7..745f80c 100644 --- a/foundation/src/stages/stage1/gnum4/default.nix +++ b/foundation/src/stages/stage1/gnum4/default.nix @@ -85,7 +85,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 94b018b..b0d237e 100644 --- a/foundation/src/stages/stage1/gnumake/default.nix +++ b/foundation/src/stages/stage1/gnumake/default.nix @@ -101,7 +101,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 ba25738..a31a2cb 100644 --- a/foundation/src/stages/stage1/gnutar/default.nix +++ b/foundation/src/stages/stage1/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/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 89e245e..ee4ab31 100644 --- a/foundation/src/stages/stage1/musl/default.nix +++ b/foundation/src/stages/stage1/musl/default.nix @@ -95,7 +95,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 f730cb5..af78ac8 100644 --- a/foundation/src/stages/stage1/python/default.nix +++ b/foundation/src/stages/stage1/python/default.nix @@ -104,7 +104,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 867f600..e10cb2c 100644 --- a/foundation/src/stages/stage1/xz/default.nix +++ b/foundation/src/stages/stage1/xz/default.nix @@ -88,7 +88,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 ba9e018..58817ec 100644 --- a/foundation/src/stages/stage1/zlib/default.nix +++ b/foundation/src/stages/stage1/zlib/default.nix @@ -83,7 +83,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 ebdada0..ab16e66 100644 --- a/foundation/src/stages/stage2/bash/default.nix +++ b/foundation/src/stages/stage2/bash/default.nix @@ -94,7 +94,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 31af117..bcfff43 100644 --- a/foundation/src/stages/stage2/binutils/default.nix +++ b/foundation/src/stages/stage2/binutils/default.nix @@ -120,7 +120,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 734fbcc..67470ca 100644 --- a/foundation/src/stages/stage2/coreutils/default.nix +++ b/foundation/src/stages/stage2/coreutils/default.nix @@ -99,7 +99,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 92d193b..d3da391 100644 --- a/foundation/src/stages/stage2/diffutils/default.nix +++ b/foundation/src/stages/stage2/diffutils/default.nix @@ -86,7 +86,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 2ee6280..402e5b5 100644 --- a/foundation/src/stages/stage2/findutils/default.nix +++ b/foundation/src/stages/stage2/findutils/default.nix @@ -86,7 +86,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 1a85835..ab20608 100644 --- a/foundation/src/stages/stage2/gawk/default.nix +++ b/foundation/src/stages/stage2/gawk/default.nix @@ -92,7 +92,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 8e9b7da..17f317a 100644 --- a/foundation/src/stages/stage2/gcc/default.nix +++ b/foundation/src/stages/stage2/gcc/default.nix @@ -191,7 +191,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 9167d48..51bcd1c 100644 --- a/foundation/src/stages/stage2/glibc/default.nix +++ b/foundation/src/stages/stage2/glibc/default.nix @@ -91,7 +91,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 b304cd6..e3e15b1 100644 --- a/foundation/src/stages/stage2/gnugrep/default.nix +++ b/foundation/src/stages/stage2/gnugrep/default.nix @@ -91,7 +91,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 cee3398..054920f 100644 --- a/foundation/src/stages/stage2/gnumake/default.nix +++ b/foundation/src/stages/stage2/gnumake/default.nix @@ -102,7 +102,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 12519d4..22c56f2 100644 --- a/foundation/src/stages/stage2/gnupatch/default.nix +++ b/foundation/src/stages/stage2/gnupatch/default.nix @@ -87,7 +87,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 d4a9942..6060ebf 100644 --- a/foundation/src/stages/stage2/gnused/default.nix +++ b/foundation/src/stages/stage2/gnused/default.nix @@ -93,7 +93,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 2423b09..a70ff4a 100644 --- a/foundation/src/stages/stage2/gnutar/default.nix +++ b/foundation/src/stages/stage2/gnutar/default.nix @@ -92,7 +92,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 dc9316a..9cd55d6 100644 --- a/foundation/src/stages/stage2/gzip/default.nix +++ b/foundation/src/stages/stage2/gzip/default.nix @@ -85,7 +85,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 01868cb..bddfaac 100644 --- a/foundation/src/stages/stage2/patchelf/default.nix +++ b/foundation/src/stages/stage2/patchelf/default.nix @@ -86,7 +86,8 @@ in cd patchelf-${cfg.version} # Configure - bash ./configure \ + chmod +x ./configure + ./configure \ --prefix=$out \ --build=${platform.build} \ --host=${platform.host} \