From f3a30ae07d908c3cfcdbad005484c25a0b97183a Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 13 Jun 2024 22:40:41 +0100 Subject: [PATCH 1/3] feat: inital support for x86_64-linux --- foundation/flake.nix | 5 +- foundation/src/stages/stage0/kaem/default.nix | 5 +- .../stage0/mescc-tools-extra/default.nix | 5 +- .../src/stages/stage0/mescc-tools/default.nix | 5 +- .../src/stages/stage0/phases/phase00.nix | 5 +- .../src/stages/stage0/phases/phase01.nix | 5 +- .../src/stages/stage0/phases/phase02.nix | 5 +- .../src/stages/stage0/phases/phase03.nix | 5 +- .../src/stages/stage0/phases/phase04.nix | 5 +- .../src/stages/stage0/phases/phase05.nix | 5 +- .../src/stages/stage0/phases/phase06.nix | 5 +- .../src/stages/stage0/phases/phase07.nix | 5 +- .../src/stages/stage0/phases/phase08.nix | 5 +- .../src/stages/stage0/phases/phase09.nix | 5 +- .../src/stages/stage0/phases/phase10.nix | 5 +- .../src/stages/stage0/phases/phase11.nix | 5 +- .../src/stages/stage0/phases/phase12.nix | 5 +- foundation/src/stages/stage1/bash/boot.nix | 5 +- foundation/src/stages/stage1/bash/default.nix | 5 +- .../src/stages/stage1/binutils/default.nix | 5 +- .../src/stages/stage1/bison/default.nix | 5 +- .../src/stages/stage1/bzip2/default.nix | 5 +- .../src/stages/stage1/coreutils/default.nix | 5 +- .../src/stages/stage1/diffutils/default.nix | 5 +- .../src/stages/stage1/findutils/default.nix | 5 +- foundation/src/stages/stage1/gawk/default.nix | 5 +- foundation/src/stages/stage1/gcc/default.nix | 5 +- .../src/stages/stage1/gnugrep/default.nix | 5 +- .../src/stages/stage1/gnum4/default.nix | 5 +- .../src/stages/stage1/gnumake/default.nix | 5 +- .../src/stages/stage1/gnupatch/default.nix | 5 +- .../src/stages/stage1/gnused/default.nix | 5 +- foundation/src/stages/stage1/gnutar/boot.nix | 59 +++++++++---------- .../src/stages/stage1/gnutar/default.nix | 5 +- foundation/src/stages/stage1/gzip/default.nix | 59 ++++++++++--------- .../src/stages/stage1/heirloom/default.nix | 5 +- .../src/stages/stage1/heirloom/devtools.nix | 5 +- .../stages/stage1/linux-headers/default.nix | 5 +- .../src/stages/stage1/ln-boot/default.nix | 5 +- foundation/src/stages/stage1/mes/compiler.nix | 5 +- foundation/src/stages/stage1/mes/libc.nix | 5 +- foundation/src/stages/stage1/mes/libs.nix | 5 +- foundation/src/stages/stage1/musl/boot.nix | 1 - foundation/src/stages/stage1/musl/default.nix | 5 +- .../src/stages/stage1/nyacc/default.nix | 5 +- .../src/stages/stage1/python/default.nix | 5 +- foundation/src/stages/stage1/tinycc/boot.nix | 1 + .../src/stages/stage1/tinycc/default.nix | 5 +- foundation/src/stages/stage1/xz/default.nix | 5 +- foundation/src/stages/stage1/zlib/default.nix | 5 +- foundation/src/stages/stage2/bash/default.nix | 5 +- .../src/stages/stage2/binutils/default.nix | 5 +- .../src/stages/stage2/busybox/default.nix | 5 +- .../src/stages/stage2/bzip2/default.nix | 5 +- .../src/stages/stage2/coreutils/default.nix | 5 +- .../src/stages/stage2/diffutils/default.nix | 5 +- .../src/stages/stage2/findutils/default.nix | 5 +- foundation/src/stages/stage2/gawk/default.nix | 5 +- foundation/src/stages/stage2/gcc/default.nix | 5 +- .../src/stages/stage2/glibc/default.nix | 5 +- .../src/stages/stage2/gnugrep/default.nix | 5 +- .../src/stages/stage2/gnumake/default.nix | 5 +- .../src/stages/stage2/gnupatch/default.nix | 5 +- .../src/stages/stage2/gnused/default.nix | 5 +- .../src/stages/stage2/gnutar/default.nix | 5 +- foundation/src/stages/stage2/gzip/default.nix | 5 +- .../src/stages/stage2/patchelf/default.nix | 5 +- foundation/src/system/default.nix | 2 +- 68 files changed, 312 insertions(+), 125 deletions(-) diff --git a/foundation/flake.nix b/foundation/flake.nix index abe9dc7..f91665f 100644 --- a/foundation/flake.nix +++ b/foundation/flake.nix @@ -14,7 +14,10 @@ modules = import ./src; - forEachSystem = lib.attrs.generate [ "i686-linux" ]; + forEachSystem = lib.attrs.generate [ + "i686-linux" + "x86_64-linux" + ]; in { extras = diff --git a/foundation/src/stages/stage0/kaem/default.nix b/foundation/src/stages/stage0/kaem/default.nix index acd1105..7e1ff69 100644 --- a/foundation/src/stages/stage0/kaem/default.nix +++ b/foundation/src/stages/stage0/kaem/default.nix @@ -34,7 +34,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/mescc-tools-extra/default.nix b/foundation/src/stages/stage0/mescc-tools-extra/default.nix index 253be54..d5542b3 100644 --- a/foundation/src/stages/stage0/mescc-tools-extra/default.nix +++ b/foundation/src/stages/stage0/mescc-tools-extra/default.nix @@ -42,7 +42,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/mescc-tools/default.nix b/foundation/src/stages/stage0/mescc-tools/default.nix index ce15baa..a51d460 100644 --- a/foundation/src/stages/stage0/mescc-tools/default.nix +++ b/foundation/src/stages/stage0/mescc-tools/default.nix @@ -125,7 +125,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase00.nix b/foundation/src/stages/stage0/phases/phase00.nix index 7ce452d..4b5d8fa 100644 --- a/foundation/src/stages/stage0/phases/phase00.nix +++ b/foundation/src/stages/stage0/phases/phase00.nix @@ -41,7 +41,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase01.nix b/foundation/src/stages/stage0/phases/phase01.nix index 28a856c..fdd6d30 100644 --- a/foundation/src/stages/stage0/phases/phase01.nix +++ b/foundation/src/stages/stage0/phases/phase01.nix @@ -33,7 +33,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase02.nix b/foundation/src/stages/stage0/phases/phase02.nix index fb3f1b2..62fbc76 100644 --- a/foundation/src/stages/stage0/phases/phase02.nix +++ b/foundation/src/stages/stage0/phases/phase02.nix @@ -34,7 +34,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase03.nix b/foundation/src/stages/stage0/phases/phase03.nix index f446684..410ad93 100644 --- a/foundation/src/stages/stage0/phases/phase03.nix +++ b/foundation/src/stages/stage0/phases/phase03.nix @@ -35,7 +35,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase04.nix b/foundation/src/stages/stage0/phases/phase04.nix index 53da830..60993dc 100644 --- a/foundation/src/stages/stage0/phases/phase04.nix +++ b/foundation/src/stages/stage0/phases/phase04.nix @@ -35,7 +35,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase05.nix b/foundation/src/stages/stage0/phases/phase05.nix index fe4e046..e8e4ef4 100644 --- a/foundation/src/stages/stage0/phases/phase05.nix +++ b/foundation/src/stages/stage0/phases/phase05.nix @@ -36,7 +36,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase06.nix b/foundation/src/stages/stage0/phases/phase06.nix index a5dee9f..0008768 100644 --- a/foundation/src/stages/stage0/phases/phase06.nix +++ b/foundation/src/stages/stage0/phases/phase06.nix @@ -37,7 +37,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase07.nix b/foundation/src/stages/stage0/phases/phase07.nix index 7829828..f4cbb7c 100644 --- a/foundation/src/stages/stage0/phases/phase07.nix +++ b/foundation/src/stages/stage0/phases/phase07.nix @@ -38,7 +38,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase08.nix b/foundation/src/stages/stage0/phases/phase08.nix index 0656675..c2ccacf 100644 --- a/foundation/src/stages/stage0/phases/phase08.nix +++ b/foundation/src/stages/stage0/phases/phase08.nix @@ -39,7 +39,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase09.nix b/foundation/src/stages/stage0/phases/phase09.nix index c3fe96d..ae9d4bd 100644 --- a/foundation/src/stages/stage0/phases/phase09.nix +++ b/foundation/src/stages/stage0/phases/phase09.nix @@ -40,7 +40,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase10.nix b/foundation/src/stages/stage0/phases/phase10.nix index 67dac35..abd6b45 100644 --- a/foundation/src/stages/stage0/phases/phase10.nix +++ b/foundation/src/stages/stage0/phases/phase10.nix @@ -41,7 +41,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase11.nix b/foundation/src/stages/stage0/phases/phase11.nix index 8873ae0..cbd456e 100644 --- a/foundation/src/stages/stage0/phases/phase11.nix +++ b/foundation/src/stages/stage0/phases/phase11.nix @@ -40,7 +40,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase12.nix b/foundation/src/stages/stage0/phases/phase12.nix index c7634a7..33b1e5a 100644 --- a/foundation/src/stages/stage0/phases/phase12.nix +++ b/foundation/src/stages/stage0/phases/phase12.nix @@ -40,7 +40,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/bash/boot.nix b/foundation/src/stages/stage1/bash/boot.nix index d5c7035..8a59ced 100644 --- a/foundation/src/stages/stage1/bash/boot.nix +++ b/foundation/src/stages/stage1/bash/boot.nix @@ -31,7 +31,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/bash/default.nix b/foundation/src/stages/stage1/bash/default.nix index 2e0b319..8565c70 100644 --- a/foundation/src/stages/stage1/bash/default.nix +++ b/foundation/src/stages/stage1/bash/default.nix @@ -34,7 +34,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage1/binutils/default.nix b/foundation/src/stages/stage1/binutils/default.nix index cbe9333..bcd43fb 100644 --- a/foundation/src/stages/stage1/binutils/default.nix +++ b/foundation/src/stages/stage1/binutils/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/bison/default.nix b/foundation/src/stages/stage1/bison/default.nix index 711f85e..573adb1 100644 --- a/foundation/src/stages/stage1/bison/default.nix +++ b/foundation/src/stages/stage1/bison/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/bzip2/default.nix b/foundation/src/stages/stage1/bzip2/default.nix index 5435bcb..3c92791 100644 --- a/foundation/src/stages/stage1/bzip2/default.nix +++ b/foundation/src/stages/stage1/bzip2/default.nix @@ -33,7 +33,10 @@ in type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; # TODO: Support more platforms. - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/coreutils/default.nix b/foundation/src/stages/stage1/coreutils/default.nix index a3390e7..0f037e2 100644 --- a/foundation/src/stages/stage1/coreutils/default.nix +++ b/foundation/src/stages/stage1/coreutils/default.nix @@ -34,7 +34,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/diffutils/default.nix b/foundation/src/stages/stage1/diffutils/default.nix index c3903ea..9829ca7 100644 --- a/foundation/src/stages/stage1/diffutils/default.nix +++ b/foundation/src/stages/stage1/diffutils/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/findutils/default.nix b/foundation/src/stages/stage1/findutils/default.nix index 30eb797..e4ac41f 100644 --- a/foundation/src/stages/stage1/findutils/default.nix +++ b/foundation/src/stages/stage1/findutils/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/gawk/default.nix b/foundation/src/stages/stage1/gawk/default.nix index 0ac0583..c4015fc 100644 --- a/foundation/src/stages/stage1/gawk/default.nix +++ b/foundation/src/stages/stage1/gawk/default.nix @@ -34,7 +34,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage1/gcc/default.nix b/foundation/src/stages/stage1/gcc/default.nix index 93f91d9..978fa6d 100644 --- a/foundation/src/stages/stage1/gcc/default.nix +++ b/foundation/src/stages/stage1/gcc/default.nix @@ -38,7 +38,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/gnugrep/default.nix b/foundation/src/stages/stage1/gnugrep/default.nix index f5150fb..110e260 100644 --- a/foundation/src/stages/stage1/gnugrep/default.nix +++ b/foundation/src/stages/stage1/gnugrep/default.nix @@ -31,7 +31,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage1/gnum4/default.nix b/foundation/src/stages/stage1/gnum4/default.nix index 35482a7..06c126c 100644 --- a/foundation/src/stages/stage1/gnum4/default.nix +++ b/foundation/src/stages/stage1/gnum4/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/gnumake/default.nix b/foundation/src/stages/stage1/gnumake/default.nix index 94b018b..b51f9cc 100644 --- a/foundation/src/stages/stage1/gnumake/default.nix +++ b/foundation/src/stages/stage1/gnumake/default.nix @@ -34,7 +34,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/gnupatch/default.nix b/foundation/src/stages/stage1/gnupatch/default.nix index af02e78..30c4b25 100644 --- a/foundation/src/stages/stage1/gnupatch/default.nix +++ b/foundation/src/stages/stage1/gnupatch/default.nix @@ -31,7 +31,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/gnused/default.nix b/foundation/src/stages/stage1/gnused/default.nix index 3c4418f..91ad67c 100644 --- a/foundation/src/stages/stage1/gnused/default.nix +++ b/foundation/src/stages/stage1/gnused/default.nix @@ -34,7 +34,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage1/gnutar/boot.nix b/foundation/src/stages/stage1/gnutar/boot.nix index df5d8a1..16586e2 100644 --- a/foundation/src/stages/stage1/gnutar/boot.nix +++ b/foundation/src/stages/stage1/gnutar/boot.nix @@ -34,43 +34,40 @@ in sha256 = "02m6gajm647n8l9a5bnld6fnbgdpyi4i3i83p7xcwv0kif47xhy6"; }; - package = - let - in - builders.bash.boot.build { - name = "gnutar-boot-${cfg.version}"; + package = builders.bash.boot.build { + name = "gnutar-boot-${cfg.version}"; - meta = stage1.gnutar.meta; + meta = stage1.gnutar.meta; - deps.build.host = [ - stage1.tinycc.mes.compiler.package - stage1.gnumake.boot.package - stage1.gnused.boot.package - stage1.gnugrep.package - ]; + deps.build.host = [ + stage1.tinycc.mes.compiler.package + stage1.gnumake.boot.package + stage1.gnused.boot.package + stage1.gnugrep.package + ]; - script = '' - # Unpack - ungz --file ${cfg.src} --output tar.tar - untar --file tar.tar - rm tar.tar - cd tar-${cfg.version} + script = '' + # Unpack + ungz --file ${cfg.src} --output tar.tar + untar --file tar.tar + rm tar.tar + cd tar-${cfg.version} - # Configure - export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib" - bash ./configure \ - --build=${platform.build} \ - --host=${platform.host} \ - --disable-nls \ - --prefix=$out + # Configure + export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib" + bash ./configure \ + --build=${platform.build} \ + --host=${platform.host} \ + --disable-nls \ + --prefix=$out - # Build - make AR="tcc -ar" + # Build + make AR="tcc -ar" - # Install - make install - ''; - }; + # Install + make install + ''; + }; }; }; } diff --git a/foundation/src/stages/stage1/gnutar/default.nix b/foundation/src/stages/stage1/gnutar/default.nix index ba25738..647e19c 100644 --- a/foundation/src/stages/stage1/gnutar/default.nix +++ b/foundation/src/stages/stage1/gnutar/default.nix @@ -37,7 +37,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage1/gzip/default.nix b/foundation/src/stages/stage1/gzip/default.nix index a59b251..f7ebd85 100644 --- a/foundation/src/stages/stage1/gzip/default.nix +++ b/foundation/src/stages/stage1/gzip/default.nix @@ -31,7 +31,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; @@ -60,39 +63,37 @@ in sha256 = "0ryr5b00qz3xcdcv03qwjdfji8pasp0007ay3ppmk71wl8c1i90w"; }; - package = - let - in - builders.bash.boot.build { - name = "gzip-${cfg.version}"; - meta = cfg.meta; + package = builders.bash.boot.build { + name = "gzip-${cfg.version}"; + meta = cfg.meta; - deps.build.host = [ - stage1.tinycc.mes.compiler.package - stage1.gnumake.boot.package - stage1.gnused.boot.package - stage1.gnugrep.package - ]; + deps.build.host = [ + stage1.tinycc.mes.compiler.package + stage1.gnumake.boot.package + stage1.gnused.boot.package + stage1.gnugrep.package + ]; - script = '' - # Unpack - ungz --file ${cfg.src} --output gzip.tar - untar --file gzip.tar - rm gzip.tar - cd gzip-${cfg.version} + script = '' + # Unpack + ungz --file ${cfg.src} --output gzip.tar + untar --file gzip.tar + rm gzip.tar + cd gzip-${cfg.version} - # Configure - export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib -Dstrlwr=unused" - bash ./configure --prefix=$out + # Configure + export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib -Dstrlwr=unused" + chmod +x ./configure + ./configure --prefix=$out - # Build - make + # Build + make - # Install - mkdir $out - make install - ''; - }; + # Install + mkdir $out + make install + ''; + }; }; }; } diff --git a/foundation/src/stages/stage1/heirloom/default.nix b/foundation/src/stages/stage1/heirloom/default.nix index 63f79cf..9c74792 100644 --- a/foundation/src/stages/stage1/heirloom/default.nix +++ b/foundation/src/stages/stage1/heirloom/default.nix @@ -45,7 +45,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/heirloom/devtools.nix b/foundation/src/stages/stage1/heirloom/devtools.nix index 87b9243..2c043ba 100644 --- a/foundation/src/stages/stage1/heirloom/devtools.nix +++ b/foundation/src/stages/stage1/heirloom/devtools.nix @@ -53,7 +53,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; }; diff --git a/foundation/src/stages/stage1/linux-headers/default.nix b/foundation/src/stages/stage1/linux-headers/default.nix index c999611..6918cc2 100644 --- a/foundation/src/stages/stage1/linux-headers/default.nix +++ b/foundation/src/stages/stage1/linux-headers/default.nix @@ -26,7 +26,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/ln-boot/default.nix b/foundation/src/stages/stage1/ln-boot/default.nix index 7b98c20..c21c3eb 100644 --- a/foundation/src/stages/stage1/ln-boot/default.nix +++ b/foundation/src/stages/stage1/ln-boot/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/mes/compiler.nix b/foundation/src/stages/stage1/mes/compiler.nix index e45e0e2..f753f47 100644 --- a/foundation/src/stages/stage1/mes/compiler.nix +++ b/foundation/src/stages/stage1/mes/compiler.nix @@ -33,7 +33,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/mes/libc.nix b/foundation/src/stages/stage1/mes/libc.nix index 97a07de..42315e3 100644 --- a/foundation/src/stages/stage1/mes/libc.nix +++ b/foundation/src/stages/stage1/mes/libc.nix @@ -31,7 +31,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/mes/libs.nix b/foundation/src/stages/stage1/mes/libs.nix index aa75bd7..b8b3b3c 100644 --- a/foundation/src/stages/stage1/mes/libs.nix +++ b/foundation/src/stages/stage1/mes/libs.nix @@ -33,7 +33,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/musl/boot.nix b/foundation/src/stages/stage1/musl/boot.nix index 4b1e2fa..9c1b8c7 100644 --- a/foundation/src/stages/stage1/musl/boot.nix +++ b/foundation/src/stages/stage1/musl/boot.nix @@ -131,7 +131,6 @@ in # Install make install cp ${stage1.tinycc.mes.libs.package}/lib/libtcc1.a $out/lib - ''; }; }; diff --git a/foundation/src/stages/stage1/musl/default.nix b/foundation/src/stages/stage1/musl/default.nix index 89e245e..fa94e91 100644 --- a/foundation/src/stages/stage1/musl/default.nix +++ b/foundation/src/stages/stage1/musl/default.nix @@ -35,7 +35,10 @@ in type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; # TODO: Support more platforms. - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/nyacc/default.nix b/foundation/src/stages/stage1/nyacc/default.nix index 799b361..5f4b9bb 100644 --- a/foundation/src/stages/stage1/nyacc/default.nix +++ b/foundation/src/stages/stage1/nyacc/default.nix @@ -34,7 +34,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/python/default.nix b/foundation/src/stages/stage1/python/default.nix index f730cb5..47ff27f 100644 --- a/foundation/src/stages/stage1/python/default.nix +++ b/foundation/src/stages/stage1/python/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/tinycc/boot.nix b/foundation/src/stages/stage1/tinycc/boot.nix index 9e139e4..4980917 100644 --- a/foundation/src/stages/stage1/tinycc/boot.nix +++ b/foundation/src/stages/stage1/tinycc/boot.nix @@ -38,6 +38,7 @@ in default.value = [ "x86_64-linux" "i686-linux" + "x86_64-linux" ]; }; }; diff --git a/foundation/src/stages/stage1/tinycc/default.nix b/foundation/src/stages/stage1/tinycc/default.nix index b599aab..2f86831 100644 --- a/foundation/src/stages/stage1/tinycc/default.nix +++ b/foundation/src/stages/stage1/tinycc/default.nix @@ -37,7 +37,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/xz/default.nix b/foundation/src/stages/stage1/xz/default.nix index 867f600..5b80aa0 100644 --- a/foundation/src/stages/stage1/xz/default.nix +++ b/foundation/src/stages/stage1/xz/default.nix @@ -35,7 +35,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage1/zlib/default.nix b/foundation/src/stages/stage1/zlib/default.nix index ba9e018..0014419 100644 --- a/foundation/src/stages/stage1/zlib/default.nix +++ b/foundation/src/stages/stage1/zlib/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/bash/default.nix b/foundation/src/stages/stage2/bash/default.nix index ebdada0..506fcf8 100644 --- a/foundation/src/stages/stage2/bash/default.nix +++ b/foundation/src/stages/stage2/bash/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage2/binutils/default.nix b/foundation/src/stages/stage2/binutils/default.nix index 31af117..8a6ab7e 100644 --- a/foundation/src/stages/stage2/binutils/default.nix +++ b/foundation/src/stages/stage2/binutils/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/busybox/default.nix b/foundation/src/stages/stage2/busybox/default.nix index 8d50e48..481b9d5 100644 --- a/foundation/src/stages/stage2/busybox/default.nix +++ b/foundation/src/stages/stage2/busybox/default.nix @@ -33,7 +33,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/bzip2/default.nix b/foundation/src/stages/stage2/bzip2/default.nix index e503604..addce76 100644 --- a/foundation/src/stages/stage2/bzip2/default.nix +++ b/foundation/src/stages/stage2/bzip2/default.nix @@ -33,7 +33,10 @@ in type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; # TODO: Support more platforms. - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/coreutils/default.nix b/foundation/src/stages/stage2/coreutils/default.nix index 734fbcc..f9c6ebd 100644 --- a/foundation/src/stages/stage2/coreutils/default.nix +++ b/foundation/src/stages/stage2/coreutils/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/diffutils/default.nix b/foundation/src/stages/stage2/diffutils/default.nix index 92d193b..3e8962e 100644 --- a/foundation/src/stages/stage2/diffutils/default.nix +++ b/foundation/src/stages/stage2/diffutils/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/findutils/default.nix b/foundation/src/stages/stage2/findutils/default.nix index 2ee6280..a39f3e6 100644 --- a/foundation/src/stages/stage2/findutils/default.nix +++ b/foundation/src/stages/stage2/findutils/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/gawk/default.nix b/foundation/src/stages/stage2/gawk/default.nix index 1a85835..44748b1 100644 --- a/foundation/src/stages/stage2/gawk/default.nix +++ b/foundation/src/stages/stage2/gawk/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage2/gcc/default.nix b/foundation/src/stages/stage2/gcc/default.nix index 8e9b7da..bbe293b 100644 --- a/foundation/src/stages/stage2/gcc/default.nix +++ b/foundation/src/stages/stage2/gcc/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/glibc/default.nix b/foundation/src/stages/stage2/glibc/default.nix index 9167d48..6a4d539 100644 --- a/foundation/src/stages/stage2/glibc/default.nix +++ b/foundation/src/stages/stage2/glibc/default.nix @@ -33,7 +33,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/gnugrep/default.nix b/foundation/src/stages/stage2/gnugrep/default.nix index b304cd6..455253d 100644 --- a/foundation/src/stages/stage2/gnugrep/default.nix +++ b/foundation/src/stages/stage2/gnugrep/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage2/gnumake/default.nix b/foundation/src/stages/stage2/gnumake/default.nix index cee3398..9c4f081 100644 --- a/foundation/src/stages/stage2/gnumake/default.nix +++ b/foundation/src/stages/stage2/gnumake/default.nix @@ -33,7 +33,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/gnupatch/default.nix b/foundation/src/stages/stage2/gnupatch/default.nix index 12519d4..a3cb474 100644 --- a/foundation/src/stages/stage2/gnupatch/default.nix +++ b/foundation/src/stages/stage2/gnupatch/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/gnused/default.nix b/foundation/src/stages/stage2/gnused/default.nix index d4a9942..d9735b9 100644 --- a/foundation/src/stages/stage2/gnused/default.nix +++ b/foundation/src/stages/stage2/gnused/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage2/gnutar/default.nix b/foundation/src/stages/stage2/gnutar/default.nix index 2423b09..d0b75ba 100644 --- a/foundation/src/stages/stage2/gnutar/default.nix +++ b/foundation/src/stages/stage2/gnutar/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; mainProgram = lib.options.create { diff --git a/foundation/src/stages/stage2/gzip/default.nix b/foundation/src/stages/stage2/gzip/default.nix index dc9316a..9f16f10 100644 --- a/foundation/src/stages/stage2/gzip/default.nix +++ b/foundation/src/stages/stage2/gzip/default.nix @@ -32,7 +32,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/stages/stage2/patchelf/default.nix b/foundation/src/stages/stage2/patchelf/default.nix index 01868cb..b34d1ed 100644 --- a/foundation/src/stages/stage2/patchelf/default.nix +++ b/foundation/src/stages/stage2/patchelf/default.nix @@ -33,7 +33,10 @@ in platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = [ "i686-linux" ]; + default.value = [ + "i686-linux" + "x86_64-linux" + ]; }; }; diff --git a/foundation/src/system/default.nix b/foundation/src/system/default.nix index d30880c..bb4d039 100644 --- a/foundation/src/system/default.nix +++ b/foundation/src/system/default.nix @@ -3,7 +3,7 @@ options.aux = { system = lib.options.create { type = lib.types.string; - default.value = "i686-linux"; + default.value = "x86_64-linux"; description = '' The system to build packages for. This value can be provided as either `config.aux.system` or by setting the `system` argument for modules. -- 2.44.0 From 3332f332b947c4a8aeaaf74a5807c2c52e77a29d Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 22 Jun 2024 10:39:58 +0100 Subject: [PATCH 2/3] 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 8565c70..a4eebac 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 bcd43fb..0a323e9 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 573adb1..b01ba1f 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 0f037e2..77869a6 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 9829ca7..440abad 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 e4ac41f..244752f 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 c4015fc..457fca7 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 978fa6d..16752f3 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 06c126c..7110754 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 b51f9cc..51b6f8c 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 16586e2..347c489 100644 --- a/foundation/src/stages/stage1/gnutar/boot.nix +++ b/foundation/src/stages/stage1/gnutar/boot.nix @@ -55,7 +55,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 647e19c..a2e0ba2 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 fa94e91..a8ddd6e 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 47ff27f..55d4d64 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 5b80aa0..7f1c13e 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 0014419..698eae1 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 506fcf8..d5aa9e3 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 8a6ab7e..9045b45 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 f9c6ebd..a9308c1 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 3e8962e..f43ab15 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 a39f3e6..8eae467 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 44748b1..f57b41c 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 bbe293b..3c60135 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 6a4d539..3d036de 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 455253d..b7a9a48 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 9c4f081..30850f1 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 a3cb474..ea95094 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 d9735b9..a1b4696 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 d0b75ba..dbdfaaf 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 9f16f10..45aaf2d 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 b34d1ed..e7681a6 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} \ -- 2.44.0 From 3ce7ab206bec9c5de9efc0e5cc9ebc4c0b0f5e6a Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 22 Jun 2024 20:38:42 +0100 Subject: [PATCH 3/3] fix(gnutar-boot): file perms error --- foundation/src/stages/stage1/gnutar/boot.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/foundation/src/stages/stage1/gnutar/boot.nix b/foundation/src/stages/stage1/gnutar/boot.nix index 347c489..92ce4dc 100644 --- a/foundation/src/stages/stage1/gnutar/boot.nix +++ b/foundation/src/stages/stage1/gnutar/boot.nix @@ -53,9 +53,12 @@ in rm tar.tar cd tar-${cfg.version} + # Fix source permissions + chmod -R +r . + chmod +x ./configure + # Configure export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib" - chmod +x ./configure ./configure \ --build=${platform.build} \ --host=${platform.host} \ -- 2.44.0