From 4203865325c33d752f814850f43d2ecb16c8fa16 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 27 Oct 2017 13:49:38 +0000 Subject: Replace use of architecture conditionals with generic project conditions The initial implementation of architecture conditionals has been removed, as the same behaviours can be implemented using the more generic mechanism for conditionals that is being introduced for BuildStream 1.0. We now have two architecture options: build_arch and arch. They are documented in project.conf. The first one controls the build sandbox while the second controls the host and target of the binaries we produce. --- elements/gnu-toolchain/stage2-fhs-dirs.bst | 37 +++++------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) (limited to 'elements/gnu-toolchain/stage2-fhs-dirs.bst') diff --git a/elements/gnu-toolchain/stage2-fhs-dirs.bst b/elements/gnu-toolchain/stage2-fhs-dirs.bst index ba420cb0..128f2f6c 100644 --- a/elements/gnu-toolchain/stage2-fhs-dirs.bst +++ b/elements/gnu-toolchain/stage2-fhs-dirs.bst @@ -30,36 +30,11 @@ config: - install -m 644 protocols "%{install-root}/etc/protocols" - echo baserock > "%{install-root}/etc/hostname" -arches: # Most 64 bit architectures need a /lib64 symlink as well as /lib. # FIXME: the create-fhs-dirs script should probably handle this... - armv8b64: - config: - install-commands: - (>): - - mkdir -p "%{install-root}/usr/lib64" - - ln -s "./usr/lib64" "%{install-root}/lib64" - armv8l64: - config: - install-commands: - (>): - - mkdir -p "%{install-root}/usr/lib64" - - ln -s "./usr/lib64" "%{install-root}/lib64" - x86_64: - config: - install-commands: - (>): - - mkdir -p "%{install-root}/usr/lib64" - - ln -s "./usr/lib64" "%{install-root}/lib64" - ppc64l: - config: - install-commands: - (>): - - mkdir -p "%{install-root}/usr/lib64" - - ln -s "./usr/lib64" "%{install-root}/lib64" - ppc64b: - config: - install-commands: - (>): - - mkdir -p "%{install-root}/usr/lib64" - - ln -s "./usr/lib64" "%{install-root}/lib64" + (?): + - arch in ["armv8b64", "armv8l64", "ppc64l", "ppc64b", "x86_64"]: + install-commands: + (>): + - mkdir -p "%{install-root}/usr/lib64" + - ln -s "./usr/lib64" "%{install-root}/lib64" -- cgit v1.2.1