auxolotl/labs
22
8
Fork 4
Code Issues 1 Pull requests 3 Actions Packages Projects Releases Wiki Activity

feat: gcc v4.6 cxx

Browse source
This commit is contained in:
Jake Hamilton 2024-06-07 03:37:03 -07:00
parent 075c520b66
commit 760b190dd1
Signed by: jakehamilton
GPG key ID: 9762169A1B35EA68
5 changed files with 268 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
foundation/src/stages/stage1/default.nix
View file

@ -69,6 +69,8 @@ in {
# These packages are built using Bash v5
stage1-gcc-46 = stage1.gcc.v46.package;
stage1-musl = stage1.musl.package;
stage1-gcc-46-cxx = stage1.gcc.v46.cxx.package;
};
extras = {

1
foundation/src/stages/stage1/gcc/default.nix
View file

@ -11,6 +11,7 @@
in {
includes = [
./v4.6.nix
./v4.6.cxx.nix
];
options.aux.foundation.stages.stage1.gcc = {

187
foundation/src/stages/stage1/gcc/v4.6.cxx.nix Normal file
View file

@ -0,0 +1,187 @@
{
lib,
config,
}: let
cfg = config.aux.foundation.stages.stage1.gcc.v46.cxx;
platform = config.aux.platform;
builders = config.aux.foundation.builders;
stage1 = config.aux.foundation.stages.stage1;
in {
options.aux.foundation.stages.stage1.gcc.v46.cxx = {
package = lib.options.create {
type = lib.types.package;
description = "The package to use for gcc-cxx.";
};
version = lib.options.create {
type = lib.types.string;
description = "Version of the package.";
};
src = lib.options.create {
type = lib.types.package;
description = "Source for the package.";
};
cc = {
src = lib.options.create {
type = lib.types.package;
description = "The cc source for the package.";
};
};
gmp = {
src = lib.options.create {
type = lib.types.package;
description = "The gmp source for the package.";
};
version = lib.options.create {
type = lib.types.string;
description = "Version of gmp.";
};
};
mpfr = {
src = lib.options.create {
type = lib.types.package;
description = "The mpfr source for the package.";
};
version = lib.options.create {
type = lib.types.string;
description = "Version of mpfr.";
};
};
mpc = {
src = lib.options.create {
type = lib.types.package;
description = "The mpc source for the package.";
};
version = lib.options.create {
type = lib.types.string;
description = "Version of mpc.";
};
};
};
config = {
aux.foundation.stages.stage1.gcc.v46.cxx = {
version = "4.6.4";
src = builtins.fetchurl {
url = "https://ftpmirror.gnu.org/gcc/gcc-${cfg.version}/gcc-core-${cfg.version}.tar.gz";
sha256 = "173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75";
};
cc = {
src = builtins.fetchurl {
url = "https://ftpmirror.gnu.org/gcc/gcc-${cfg.version}/gcc-g++-${cfg.version}.tar.gz";
sha256 = "1fqqk5zkmdg4vmqzdmip9i42q6b82i3f6yc0n86n9021cr7ms2k9";
};
};
gmp = {
version = "4.3.2";
src = builtins.fetchurl {
url = "https://ftpmirror.gnu.org/gmp/gmp-${cfg.gmp.version}.tar.gz";
sha256 = "15rwq54fi3s11izas6g985y9jklm3xprfsmym3v1g6xr84bavqvv";
};
};
mpfr = {
version = "2.4.2";
src = builtins.fetchurl {
url = "https://ftpmirror.gnu.org/mpfr/mpfr-${cfg.mpfr.version}.tar.gz";
sha256 = "0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94";
};
};
mpc = {
version = "1.0.3";
src = builtins.fetchurl {
url = "https://ftpmirror.gnu.org/mpc/mpc-${cfg.mpc.version}.tar.gz";
sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1";
};
};
package = let
patches = [
# Remove hardcoded NATIVE_SYSTEM_HEADER_DIR
./patches/no-system-headers.patch
];
in
builders.bash.build {
name = "gcc-cxx-${cfg.version}";
meta = stage1.gcc.meta;
deps.build.host = [
stage1.gcc.v46.package
stage1.binutils.package
stage1.gnumake.package
stage1.gnupatch.package
stage1.gnused.package
stage1.gnugrep.package
stage1.gawk.boot.package
stage1.diffutils.package
stage1.findutils.package
stage1.gnutar.musl.package
stage1.gzip.package
];
script = ''
# Unpack
tar xzf ${cfg.src}
tar xzf ${cfg.cc.src}
tar xzf ${cfg.gmp.src}
tar xzf ${cfg.mpfr.src}
tar xzf ${cfg.mpc.src}
cd gcc-${cfg.version}
ln -s ../gmp-${cfg.gmp.version} gmp
ln -s ../mpfr-${cfg.mpfr.version} mpfr
ln -s ../mpc-${cfg.mpc.version} mpc
# Patch
${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
# doesn't recognise musl
sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
# Configure
export CC="gcc -Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
export C_INCLUDE_PATH="${stage1.musl.package}/include"
export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
export LIBRARY_PATH="${stage1.musl.package}/lib"
bash ./configure \
--prefix=$out \
--build=${platform.build} \
--host=${platform.host} \
--with-native-system-header-dir=${stage1.musl.package}/include \
--with-build-sysroot=${stage1.musl.package} \
--enable-languages=c,c++ \
--disable-bootstrap \
--disable-libmudflap \
--disable-libstdcxx-pch \
--disable-lto \
--disable-multilib
# Build
make -j $NIX_BUILD_CORES
# Install
make -j $NIX_BUILD_CORES install
'';
};
};
};
}

14
foundation/src/stages/stage1/gcc/v4.6.nix
View file

@ -126,7 +126,7 @@ in {
deps.build.host = [
stage1.tinycc.musl.compiler.package
stage1.binutils.package
stage1.gnumake.boot.package
stage1.gnumake.package
stage1.gnupatch.package
stage1.gnused.package
stage1.gnugrep.package
@ -193,18 +193,10 @@ in {
--disable-build-with-cxx
# Build
# FIXME: This throws an error when called with more than a single job core.
# The error is "line 6: 5629 Alarm clock" which seems to be timeout related.
#
# make -j $NIX_BUILD_CORES
make
make -j $NIX_BUILD_CORES
# Install
# FIXME: This throws an error when called with more than a single job core.
# The error is "line 6: 5629 Alarm clock" which seems to be timeout related.
#
# make -j $NIX_BUILD_CORES install
make install
make -j $NIX_BUILD_CORES install
'';
};
};

75
foundation/src/stages/stage1/musl/default.nix
View file

@ -4,6 +4,7 @@
}: let
cfg = config.aux.foundation.stages.stage1.musl;
platform = config.aux.platform;
builders = config.aux.foundation.builders;
stage1 = config.aux.foundation.stages.stage1;
@ -13,6 +14,21 @@ in {
];
options.aux.foundation.stages.stage1.musl = {
package = lib.options.create {
type = lib.types.package;
description = "The package to use for musl.";
};
version = lib.options.create {
type = lib.types.string;
description = "Version of the package.";
};
src = lib.options.create {
type = lib.types.package;
description = "Source for the package.";
};
meta = {
description = lib.options.create {
type = lib.types.string;
@ -41,4 +57,63 @@ in {
};
};
};
config = {
aux.foundation.stages.stage1.musl = {
version = "1.2.4";
src = builtins.fetchurl {
url = "https://musl.libc.org/releases/musl-${cfg.version}.tar.gz";
sha256 = "ejXq4z1TcqfA2hGI3nmHJvaIJVE7euPr6XqqpSEU8Dk=";
};
package = builders.bash.build {
name = "musl-${cfg.version}";
meta = cfg.meta;
deps.build.host = [
stage1.gcc.v46.package
stage1.binutils.package
stage1.gnumake.package
stage1.gnused.package
stage1.gnugrep.package
stage1.gnutar.package
stage1.gzip.package
];
script = ''
# Unpack
tar xzf ${cfg.src}
cd musl-${cfg.version}
# Patch
# https://github.com/ZilchOS/bootstrap-from-tcc/blob/2e0c68c36b3437386f786d619bc9a16177f2e149/using-nix/2a3-intermediate-musl.nix
sed -i 's|/bin/sh|${stage1.bash.package}/bin/bash|' \
tools/*.sh
# patch popen/system to search in PATH instead of hardcoding /bin/sh
sed -i 's|posix_spawn(&pid, "/bin/sh",|posix_spawnp(\&pid, "sh",|' \
src/stdio/popen.c src/process/system.c
sed -i 's|execl("/bin/sh", "sh", "-c",|execlp("sh", "-c",|'\
src/misc/wordexp.c
# Configure
bash ./configure \
--prefix=$out \
--build=${platform.build} \
--host=${platform.host} \
--syslibdir=$out/lib \
--enable-wrapper
# Build
make -j $NIX_BUILD_CORES
# Install
make -j $NIX_BUILD_CORES install
sed -i 's|/bin/sh|${stage1.bash.package}/bin/bash|' $out/bin/*
ln -s ../lib/libc.so $out/bin/ldd
'';
};
};
};
}