From b00ef322be2fd3329b6e4844f402387c7ace91ab Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Tue, 9 Jan 2024 16:20:50 +0100 Subject: repos: Base rules on parent rules ... to propagate foreign tools that are the same in each rule set (e.g., busybox, make). --- etc/defaults/CC/foreign/clang.TARGETS | 14 ++------------ etc/defaults/CC/foreign/gcc.TARGETS | 12 +----------- etc/defaults/CC/foreign/tools.TARGETS | 12 +----------- etc/repos.json | 35 ++++++++++++----------------------- 4 files changed, 16 insertions(+), 57 deletions(-) diff --git a/etc/defaults/CC/foreign/clang.TARGETS b/etc/defaults/CC/foreign/clang.TARGETS index 74e376c..3c8dc50 100644 --- a/etc/defaults/CC/foreign/clang.TARGETS +++ b/etc/defaults/CC/foreign/clang.TARGETS @@ -1,19 +1,9 @@ { "defaults": { "type": ["CC/foreign", "defaults"] , "base": - [ ["@", "cmake", "CC/foreign", "defaults"] + [ ["@", "base", "CC/foreign", "defaults"] + , ["@", "cmake", "CC/foreign", "defaults"] , ["@", "python", "CC/foreign", "defaults"] ] - , "MAKE": ["make/bin/make"] - , "toolchain": ["staged-make", "staged-busybox"] - , "PATH": - [ "$(TOOLCHAIN)/make/bin" - , "$(TOOLCHAIN)/busybox/bin" - , "$(TOOLCHAIN)/busybox/usr/bin" - ] } -, "staged-make": - {"type": "install", "dirs": [[["@", "make", "", "toolchain"], "make"]]} -, "staged-busybox": - {"type": "install", "dirs": [[["@", "busybox", "", "toolchain"], "busybox"]]} } diff --git a/etc/defaults/CC/foreign/gcc.TARGETS b/etc/defaults/CC/foreign/gcc.TARGETS index 32ae01b..b9ea991 100644 --- a/etc/defaults/CC/foreign/gcc.TARGETS +++ b/etc/defaults/CC/foreign/gcc.TARGETS @@ -1,15 +1,5 @@ { "defaults": { "type": ["CC/foreign", "defaults"] - , "MAKE": ["make/bin/make"] - , "toolchain": ["staged-make", "staged-busybox"] - , "PATH": - [ "$(TOOLCHAIN)/make/bin" - , "$(TOOLCHAIN)/busybox/bin" - , "$(TOOLCHAIN)/busybox/usr/bin" - ] + , "base": [["@", "base", "CC/foreign", "defaults"]] } -, "staged-make": - {"type": "install", "dirs": [[["@", "make", "", "toolchain"], "make"]]} -, "staged-busybox": - {"type": "install", "dirs": [[["@", "busybox", "", "toolchain"], "busybox"]]} } diff --git a/etc/defaults/CC/foreign/tools.TARGETS b/etc/defaults/CC/foreign/tools.TARGETS index 32ae01b..b9ea991 100644 --- a/etc/defaults/CC/foreign/tools.TARGETS +++ b/etc/defaults/CC/foreign/tools.TARGETS @@ -1,15 +1,5 @@ { "defaults": { "type": ["CC/foreign", "defaults"] - , "MAKE": ["make/bin/make"] - , "toolchain": ["staged-make", "staged-busybox"] - , "PATH": - [ "$(TOOLCHAIN)/make/bin" - , "$(TOOLCHAIN)/busybox/bin" - , "$(TOOLCHAIN)/busybox/usr/bin" - ] + , "base": [["@", "base", "CC/foreign", "defaults"]] } -, "staged-make": - {"type": "install", "dirs": [[["@", "make", "", "toolchain"], "make"]]} -, "staged-busybox": - {"type": "install", "dirs": [[["@", "busybox", "", "toolchain"], "busybox"]]} } diff --git a/etc/repos.json b/etc/repos.json index 267aa49..090d101 100644 --- a/etc/repos.json +++ b/etc/repos.json @@ -38,11 +38,7 @@ , "target_root": "defaults" , "target_file_name": "gcc.TARGETS" , "rule_root": "rules" - , "bindings": - { "make": "stage-0/make" - , "busybox": "stage-0/busybox" - , "gcc": "stage-1/gcc" - } + , "bindings": {"base": "rules/stage-1", "gcc": "stage-1/gcc"} } , "rules/clang_with_gcc13": { "repository": "rules" @@ -50,23 +46,19 @@ , "target_file_name": "clang.TARGETS" , "rule_root": "rules" , "bindings": - { "make": "stage-0/make" - , "busybox": "stage-0/busybox" + { "base": "rules/gcc" , "gcc": "compilers/gcc-13.2.0-native" , "cmake": "cmake-3.27.1" , "python": "python-3.12.0" } } - , "rules/static-build": + , "rules/tools": { "repository": "rules" , "target_root": "defaults" - , "target_file_name": "static-build.TARGETS" + , "target_file_name": "tools.TARGETS" , "rule_root": "rules" , "bindings": - { "make": "stage-0/make" - , "busybox": "stage-0/busybox" - , "gcc-musl": "compilers/gcc-13.2.0-musl" - } + {"base": "rules/gcc", "gcc-musl": "compilers/gcc-13.2.0-musl"} } , "imports/stage-0/gmp-4.2.4": { "repository": @@ -218,7 +210,7 @@ } , "target_root": "imports" , "target_file_name": "boringssl.TARGETS" - , "bindings": {"rules": "rules/static-build"} + , "bindings": {"rules": "rules/tools"} } , "imports/zlib": { "repository": @@ -230,7 +222,7 @@ } , "target_root": "imports" , "target_file_name": "zlib.TARGETS" - , "bindings": {"rules": "rules/static-build"} + , "bindings": {"rules": "rules/tools"} } , "stage-0/busybox": { "repository": @@ -243,10 +235,7 @@ , "target_root": "bootstrap" , "target_file_name": "stage-0-busybox.TARGETS" , "bindings": - { "rules": "rules/stage-0" - , "gcc": "stage-0/gcc" - , "make": "stage-0/make" - } + {"rules": "rules/stage-0", "gcc": "stage-0/gcc", "make": "stage-0/make"} } , "stage-0/make": { "repository": @@ -396,7 +385,7 @@ } , "target_root": "tools" , "target_file_name": "busybox-1.36.TARGETS" - , "bindings": {"rules": "rules/static-build"} + , "bindings": {"rules": "rules/tools"} } , "tools/make-4.4.1": { "repository": @@ -408,7 +397,7 @@ } , "target_root": "tools" , "target_file_name": "make-4.4.TARGETS" - , "bindings": {"rules": "rules/static-build"} + , "bindings": {"rules": "rules/tools"} } , "tools/cmake-3.27.1": { "repository": @@ -420,7 +409,7 @@ } , "target_root": "tools" , "target_file_name": "cmake-3.27.TARGETS" - , "bindings": {"rules": "rules/static-build", "ssl": "imports/boringssl"} + , "bindings": {"rules": "rules/tools", "ssl": "imports/boringssl"} } , "tools/python-3.12.0": { "repository": @@ -432,7 +421,7 @@ } , "target_root": "tools" , "target_file_name": "python-3.12.TARGETS" - , "bindings": {"rules": "rules/static-build", "zlib": "imports/zlib"} + , "bindings": {"rules": "rules/tools", "zlib": "imports/zlib"} } , "gcc-latest-native": { "repository": "toolchains" -- cgit v1.2.3