From 7d81af64cd489c81673322f16ef3a8a580700872 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 24 Oct 2017 16:40:08 +0000
Subject: gnu-toolchain: Use new composition operators correctly

The default behaviour of BuildStream is now for lists to overwrite
the previous value when composing them. In the fhs-dirs elements our
goal is extend the install commands in certain cases, so we now need
to use the (>) operator to cause it to append to the list instead of
overwriting.
---
 elements/gnu-toolchain/fhs-dirs.bst        | 15 +++++++++------
 elements/gnu-toolchain/stage2-fhs-dirs.bst | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/elements/gnu-toolchain/fhs-dirs.bst b/elements/gnu-toolchain/fhs-dirs.bst
index 7359e584..13ed1f2e 100644
--- a/elements/gnu-toolchain/fhs-dirs.bst
+++ b/elements/gnu-toolchain/fhs-dirs.bst
@@ -31,15 +31,18 @@ arches:
   armv8b64:
     config:
       install-commands:
-      - mkdir -p "%{install-root}/usr/lib64"
-      - ln -s  "./usr/lib64" "%{install-root}/lib64"
+        (>):
+        - 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"
+        (>):
+        - 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"
+        (>):
+        - mkdir -p "%{install-root}/usr/lib64"
+        - ln -s "./usr/lib64" "%{install-root}/lib64"
diff --git a/elements/gnu-toolchain/stage2-fhs-dirs.bst b/elements/gnu-toolchain/stage2-fhs-dirs.bst
index 15281728..41a57dd3 100644
--- a/elements/gnu-toolchain/stage2-fhs-dirs.bst
+++ b/elements/gnu-toolchain/stage2-fhs-dirs.bst
@@ -36,15 +36,18 @@ arches:
   armv8b64:
     config:
       install-commands:
-      - mkdir -p "%{install-root}/usr/lib64"
-      - ln -s  "./usr/lib64" "%{install-root}/lib64"
+        (>):
+        - 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"
+        (>):
+        - 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"
+        (>):
+        - mkdir -p "%{install-root}/usr/lib64"
+        - ln -s "./usr/lib64" "%{install-root}/lib64"
-- 
cgit v1.2.1