From 227bfe9e5b16878dc9d26111f98aa39f1172714d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 28 Sep 2021 20:15:35 +0200 Subject: context: add platform relation variables build_to_host, host_to_target and build_to_target describe how two platforms are related. cross_compile and sysroot are moved into this new structure. cross_compile is added to the toplevel scope as an alias for build_to_host.cross_compile, as most packages will only ever need this. --- examples/binutils.yml | 2 +- examples/busybox.yml | 4 ++-- examples/e2fsprogs.yml | 12 ++++++------ examples/gcc.yml | 3 ++- examples/glibc.yml | 12 ++++++------ examples/linux.yml | 6 +++--- 6 files changed, 20 insertions(+), 19 deletions(-) (limited to 'examples') diff --git a/examples/binutils.yml b/examples/binutils.yml index a074da7..b3d0265 100644 --- a/examples/binutils.yml +++ b/examples/binutils.yml @@ -20,7 +20,7 @@ tasks: --host={{host.gnu_triplet}} \ --target={{target.gnu_triplet}} \ --prefix={{host.prefix}} \ - --with-sysroot={{sysroot}} \ + --with-sysroot={{host_to_target.sysroot}} \ --enable-libssp \ --enable-deterministic-archives \ --enable-plugins \ diff --git a/examples/busybox.yml b/examples/busybox.yml index 5d96d01..96a6f33 100644 --- a/examples/busybox.yml +++ b/examples/busybox.yml @@ -33,7 +33,7 @@ tasks: cd busybox-build make \ ARCH={{host.karch}} \ - CROSS_COMPILE={{host.cross_compile}} \ + CROSS_COMPILE={{cross_compile}} \ busybox busybox.links -j8 sed -i \ -e 's@^/usr@@' \ @@ -54,6 +54,6 @@ tasks: cd busybox-build make \ ARCH={{host.karch}} \ - CROSS_COMPILE={{host.cross_compile}} \ + CROSS_COMPILE={{cross_compile}} \ CONFIG_PREFIX={{destdir}}{{host.prefix}} \ install diff --git a/examples/e2fsprogs.yml b/examples/e2fsprogs.yml index 2f3cbde..72a7695 100644 --- a/examples/e2fsprogs.yml +++ b/examples/e2fsprogs.yml @@ -18,12 +18,12 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - export CC={{host.cross_compile}}gcc - export CXX={{host.cross_compile}}g++ - export AR={{host.cross_compile}}ar - export NM={{host.cross_compile}}nm - export RANLIB={{host.cross_compile}}ranlib - export STRIP={{host.cross_compile}}strip + export CC={{cross_compile}}gcc + export CXX={{cross_compile}}g++ + export AR={{cross_compile}}ar + export NM={{cross_compile}}nm + export RANLIB={{cross_compile}}ranlib + export STRIP={{cross_compile}}strip mkdir e2fsprogs-build cd e2fsprogs-build diff --git a/examples/gcc.yml b/examples/gcc.yml index 436ab8c..8e6105a 100644 --- a/examples/gcc.yml +++ b/examples/gcc.yml @@ -41,7 +41,8 @@ tasks: --prefix={{host.prefix}} \ --libdir={{host.prefix}}/lib \ --libexecdir={{host.prefix}}/lib \ - --with-sysroot={{sysroot}} \ + --with-sysroot={{host_to_target.sysroot}} \ + --with-build-sysroot={{build_to_target.sysroot}} \ --with-native-system-header-dir={{target.prefix}}/include \ --with-build-time-tools={{build.prefix}}/{{target.gnu_triplet}}/bin \ --with-gnu-ld \ diff --git a/examples/glibc.yml b/examples/glibc.yml index 5ee9aeb..337ae2f 100644 --- a/examples/glibc.yml +++ b/examples/glibc.yml @@ -21,12 +21,12 @@ tasks: task: 'install' run: | export BUILD_CC=gcc - export CC={{host.cross_compile}}gcc - export CXX={{host.cross_compile}}g++ - export AR={{host.cross_compile}}ar - export NM={{host.cross_compile}}nm - export RANLIB={{host.cross_compile}}ranlib - export READELF={{host.cross_compile}}readelf + export CC={{cross_compile}}gcc + export CXX={{cross_compile}}g++ + export AR={{cross_compile}}ar + export NM={{cross_compile}}nm + export RANLIB={{cross_compile}}ranlib + export READELF={{cross_compile}}readelf mkdir glibc-build cd glibc-build diff --git a/examples/linux.yml b/examples/linux.yml index 6e4426b..6019021 100644 --- a/examples/linux.yml +++ b/examples/linux.yml @@ -20,7 +20,7 @@ tasks: make \ -f ../linux-5.10.66/Makefile \ ARCH={{host.karch}} \ - CROSS_COMPILE={{host.cross_compile}} \ + CROSS_COMPILE={{cross_compile}} \ defconfig compile: @@ -32,7 +32,7 @@ tasks: cd linux-build make \ ARCH={{host.karch}} \ - CROSS_COMPILE={{host.cross_compile}} \ + CROSS_COMPILE={{cross_compile}} \ all -j8 install: @@ -50,7 +50,7 @@ tasks: mkdir -p {{destdir}}/boot make \ ARCH={{host.karch}} \ - CROSS_COMPILE={{host.cross_compile}} \ + CROSS_COMPILE={{cross_compile}} \ INSTALL_PATH={{destdir}}/boot \ INSTALL_MOD_PATH={{destdir}}/modules{{host.prefix}} \ DEPMOD=true \ -- cgit v1.2.3