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

wip: fix extend, no working cross compile

Browse source
This commit is contained in:
Jake Hamilton 2024-08-20 13:33:06 -07:00
parent cadfaabc85
commit e21778c81b
Signed by: jakehamilton
GPG key ID: 9762169A1B35EA68
9 changed files with 384 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
foundation/flake.lock
View file

@ -3,17 +3,18 @@
"lib": {
"locked": {
"dir": "lib",
"dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
"dirtyShortRev": "2be3111-dirty",
"lastModified": 1719251485,
"narHash": "sha256-63NvfFVeTDITfNu60rmCUlaZtAeZUnvrIaOLSk9ScC8=",
"lastModified": 1723737980,
"narHash": "sha256-1WnFatW5kSuO2jjt62hvSbH84TSYyO+VmvkJ0d5e/ZY=",
"ref": "master",
"rev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13",
"revCount": 82,
"type": "git",
"url": "file:../?dir=lib"
"url": "file:../"
},
"original": {
"dir": "lib",
"type": "git",
"url": "file:../?dir=lib"
"url": "file:../"
}
},
"root": {

24
tidepool/flake.lock
View file

@ -8,33 +8,33 @@
},
"locked": {
"dir": "foundation",
"dirtyRev": "3f9d287065ac685ce500c2cddb35428b2927f5a2-dirty",
"dirtyShortRev": "3f9d287-dirty",
"lastModified": 1720514984,
"narHash": "sha256-AuixwSlYk34Z6+GEc7y4QotF3Hk963zC9I9hAwX5KCE=",
"dirtyRev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13-dirty",
"dirtyShortRev": "cadfaab-dirty",
"lastModified": 1723737980,
"narHash": "sha256-wytg4odrfvFVYvTskWUficyi8VnaaEt54aIlKUn3SKw=",
"type": "git",
"url": "file:../?dir=foundation"
"url": "file:../"
},
"original": {
"dir": "foundation",
"type": "git",
"url": "file:../?dir=foundation"
"url": "file:../"
}
},
"lib": {
"locked": {
"dir": "lib",
"dirtyRev": "3f9d287065ac685ce500c2cddb35428b2927f5a2-dirty",
"dirtyShortRev": "3f9d287-dirty",
"lastModified": 1720514984,
"narHash": "sha256-AuixwSlYk34Z6+GEc7y4QotF3Hk963zC9I9hAwX5KCE=",
"dirtyRev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13-dirty",
"dirtyShortRev": "cadfaab-dirty",
"lastModified": 1723737980,
"narHash": "sha256-wytg4odrfvFVYvTskWUficyi8VnaaEt54aIlKUn3SKw=",
"type": "git",
"url": "file:../?dir=lib"
"url": "file:../"
},
"original": {
"dir": "lib",
"type": "git",
"url": "file:../?dir=lib"
"url": "file:../"
}
},
"root": {

11
tidepool/src/builders/basic.nix
View file

@ -65,7 +65,15 @@ in
PATH =
let
bins = lib.paths.bin (
(lib.packages.dependencies.get dependencies.build.host)
(lib.packages.dependencies.get dependencies.build.only)
++ (lib.packages.dependencies.get dependencies.build.build)
++ (lib.packages.dependencies.get dependencies.build.host)
++ (lib.packages.dependencies.get dependencies.build.target)
++ (lib.packages.dependencies.get dependencies.host.only)
++ (lib.packages.dependencies.get dependencies.host.host)
++ (lib.packages.dependencies.get dependencies.host.target)
++ (lib.packages.dependencies.get dependencies.target.only)
++ (lib.packages.dependencies.get dependencies.target.target)
++ [
foundation.stage2-bash
foundation.stage2-coreutils
@ -99,6 +107,7 @@ in
}
);
in
# (builtins.trace "build: ${package.name} -> build=${package.platform.build.triple} host=${package.platform.host.triple} target=${package.platform.target.triple}")
built
// {
inherit (package) meta;

18
tidepool/src/export.nix
View file

@ -26,16 +26,32 @@ in
# }))
# .config;
foundation-gcc = config.packages.foundation.gcc;
foundation-glibc = config.packages.foundation.glibc;
foundation-binutils = config.packages.foundation.binutils;
foundation-linux-headers = config.packages.foundation.linux-headers;
# foundation-linux-headers = config.packages.foundation.linux-headers.versions.latest.extend {
# platform.host = lib.modules.overrides.force "x86_64-linux";
# };
# example-x = config.packages.example.x;
cross-aux-a-x86_64-linux = config.packages.cross.x86_64-linux.aux.a;
cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc;
example-a = config.packages.foundation.gcc.versions.latest.extend {
platform = {
target = lib.modules.override 0 "x86_64-linux";
};
};
};
};
# exported.packages.i686-linux.example-b =
# let
# pkg =
# config.packages.foundation.gcc.versions.latest.extend {
# platform = {
# target = "aarch64-linux";
# };
# };
# in
# pkg.package;
# exported.packages.i686-linux.cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc.package;
};

47
tidepool/src/lib/types.nix
View file

@ -230,6 +230,34 @@ in
default.value = [ ];
};
# extend = lib.options.create {
# description = "Extend the package definition.";
# type = lib.types.function lib.types.raw;
# internal = true;
# writable = false;
# default.value = module:
# let
# normalized =
# if builtins.isList module then
# module
# else if builtins.isFunction module || module ? config then
# [ module ]
# else
# [{
# config = module;
# }];
# result = meta.extend {
# modules =
# normalized ++ [
# {
# config.__modules__ = lib.modules.overrides.force (config.__modules__ ++ normalized);
# }
# ];
# };
# in
# result.config;
# };
extend = lib.options.create {
description = "Extend the package definition.";
type = lib.types.function lib.types.raw;
@ -246,13 +274,14 @@ in
[{
config = module;
}];
result = meta.extend {
modules =
normalized ++ [
{
config.__modules__ = lib.modules.overrides.force (config.__modules__ ++ normalized);
}
];
modules = config.__modules__ ++ normalized;
result = lib.modules.run {
modules = [
submodule
{ config.__modules__ = modules; }
] ++ modules;
};
in
result.config;
@ -261,8 +290,8 @@ in
meta = {
description = lib.options.create {
description = "The description for the package.";
type = lib.types.nullish lib.types.string;
default.value = null;
type = lib.types.string;
default.value = "";
};
homepage = lib.options.create {

2
tidepool/src/packages/aux/a.nix
View file

@ -1,4 +1,4 @@
{ lib', config }:
{ config }:
let
inherit (config) builders packages;
in

33
tidepool/src/packages/foundation/binutils/default.nix
View file

@ -1,8 +1,8 @@
{
lib,
lib',
config,
options,
{ lib
, lib'
, config
, options
,
}:
let
inherit (config)
@ -27,7 +27,14 @@ in
};
};
config = {
config =
let
isBuildBootstrapped = config.platform.build.double == "i686-linux";
isHostBootstrapped = config.platform.host.double == "i686-linux";
isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
in
{
meta = {
platforms = [ "i686-linux" ];
};
@ -39,15 +46,18 @@ in
deps = {
build = {
host = {
inherit (packages.foundation) gcc;
only = {
gcc = lib.modules.when (!isBootstrapped) packages.foundation.gcc;
};
};
};
env = {
PATH = lib.paths.bin [
# foundation.stage2-gcc
PATH = lib.paths.bin (
lib.lists.when isBootstrapped
[ foundation.stage2-gcc ]
++ [
foundation.stage2-gcc
foundation.stage2-binutils
foundation.stage2-gnumake
foundation.stage2-gnupatch
@ -58,7 +68,8 @@ in
foundation.stage2-findutils
foundation.stage2-gnutar
foundation.stage1-xz
];
]
);
};
phases =

100
tidepool/src/packages/foundation/gcc/default.nix
View file

@ -84,20 +84,80 @@ in
};
};
config = {
config =
let
isBuildBootstrapped = config.platform.build.double == "i686-linux";
isHostBootstrapped = config.platform.host.double == "i686-linux";
isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
in
{
meta = {
platforms = [ "i686-linux" ];
};
pname = "gcc";
pname = "gcc-${config.platform.build.double}--${config.platform.host.double}--${config.platform.target.double}";
version = "13.2.0";
builder = builders.basic;
# hooks = ctx: let
#
# in {
# "aux:gcc:env" = lib.dag.entry.before [ "unpack" ] ''
#
# '';
# };
deps =
let
platform =
if !isBuildBootstrapped then
{
build = "i686-linux";
host = lib.modules.override 0 config.platform.build.triple;
target = lib.modules.override 0 config.platform.build.triple;
}
else
{
build = "i686-linux";
host = "i686-linux";
target = lib.modules.override 0 config.platform.host.triple;
};
in
{
build = {
only = {
gcc =
lib.modules.when
(!isBootstrapped)
(packages.foundation.gcc.versions.latest.extend {
inherit platform;
});
};
build = {
binutils = packages.foundation.binutils;
linux-headers = packages.foundation.linux-headers;
glibc = packages.foundation.glibc;
};
};
};
hooks = ctx: {
"aux:compiler:setup" = lib.dag.entry.before [ "unpack" ] ''
: ''${AUX_COMPILER_LIBRARY_PATH:=}
'';
};
env = {
PATH = lib.paths.bin [
PATH = lib.paths.bin (
lib.lists.when
(isBootstrapped)
[
foundation.stage2-gcc
foundation.stage2-binutils
# foundation.stage2-binutils
]
++ [
foundation.stage2-gnumake
foundation.stage2-gnused
foundation.stage2-gnugrep
@ -108,16 +168,23 @@ in
foundation.stage2-gzip
foundation.stage2-bzip2
foundation.stage1-xz
];
]
);
};
phases =
let
host = lib.systems.withBuildInfo config.platform.host;
compiler = if isBootstrapped then "gcc" else "${config.platform.build.triple}-gcc";
mbits = if host.system.cpu.family == "x86" then if host.is64bit then "-m64" else "-m32" else "";
in
{
"aux:compiler:setup" = ''
: ''${AUX_COMPILER_LIBRARY_PATH:=}
'';
unpack = ''
# Unpack
tar xf ${config.src}
@ -136,23 +203,30 @@ in
patch = ''
# Patch
# force musl even if host triple is gnu
sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
# sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
'';
configure = ''
# Configure
export CC="gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
export CXX="g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
export LIBRARY_PATH="${foundation.stage1-musl}/lib"
# export CC="gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
# export CXX="g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
# export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
export CC="gcc -Wl,-dynamic-linker"
export CXX="g++ -Wl,-dynamic-linker"
export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker"
# export LIBRARY_PATH="${foundation.stage1-musl}/lib"
export LIBRARY_PATH="$AUX_COMPILER_LIBRARY_PATH"
: ''${LD_LIBRARY_PATH:=}
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/gmp/lib:$NIX_BUILD_TOP/mpfr/lib:$NIX_BUILD_TOP/mpc/lib:$NIX_BUILD_TOP/isl/lib:$LD_LIBRARY_PATH"
# --with-sysroot=${foundation.stage1-musl} \
# --with-native-system-header-dir=/include \
bash ./configure \
--prefix=$out \
--build=${config.platform.build.triple} \
--host=${config.platform.host.triple} \
--target=${config.platform.target.triple} \
--with-native-system-header-dir=/include \
--with-sysroot=${foundation.stage1-musl} \
--enable-languages=c,c++ \
--disable-bootstrap \
--disable-libsanitizer \
@ -170,7 +244,7 @@ in
install = ''
# Install
make -j $NIX_BUILD_CORES install-strip
make -j $NIX_BUILD_CORES install
'';
};

10
tidepool/src/packages/foundation/glibc/default.nix
View file

@ -41,6 +41,12 @@ in
builder = builders.basic;
hooks = ctx: {
"aux:glibc:env" = lib.dag.entry.between ["aux:compiler:setup"] ["configure"] ''
AUX_COMPILER_LIBRARY_PATH="${config.package}/lib:$AUX_COMPILER_LIBRARY_PATH"
'';
};
env = {
PATH =
let
@ -74,6 +80,8 @@ in
foundation.stage2-gnutar
foundation.stage2-gzip
foundation.stage2-bzip2
foundation.stage1-python
foundation.stage1-bison
foundation.stage1-xz
];
};
@ -103,7 +111,7 @@ in
install = ''
# Install
make -j $NIX_BUILD_CORES install-strip
make -j $NIX_BUILD_CORES INSTALL_UNCOMPRESSED=yes install
'';
};
};