From 2b3035c1f34fbc92eef1dec0c9f186372a8df7ed Mon Sep 17 00:00:00 2001
From: Lachlan Mackenzie <lachlan.mackenzie@codethink.co.uk>
Date: Fri, 11 Jan 2019 18:11:52 +0000
Subject: Put in some corrections for known buildstream architectures

---
 elements/gnu-toolchain/fhs-dirs.bst                 | 2 +-
 elements/gnu-toolchain/gcc.bst                      | 2 +-
 elements/gnu-toolchain/glibc.bst                    | 2 +-
 elements/gnu-toolchain/linux-api-headers.bst        | 4 ++--
 elements/gnu-toolchain/stage2-fhs-dirs.bst          | 2 +-
 elements/gnu-toolchain/stage2-gcc.bst               | 2 +-
 elements/gnu-toolchain/stage2-glibc.bst             | 6 +++---
 elements/gnu-toolchain/stage2-linux-api-headers.bst | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/elements/gnu-toolchain/fhs-dirs.bst b/elements/gnu-toolchain/fhs-dirs.bst
index 260351b9..06e81858 100644
--- a/elements/gnu-toolchain/fhs-dirs.bst
+++ b/elements/gnu-toolchain/fhs-dirs.bst
@@ -28,7 +28,7 @@ config:
   # Most 64 bit architectures need a /lib64 symlink as well as /lib.
   # FIXME: the create-fhs-dirs script should probably handle this...
   (?):
-    - arch in ["armv8b64", "armv8l64", "ppc64l", "ppc64b", "x86_64"]:
+    - arch in ["armv8b", "armv8l", "ppc64le", "ppc64", "x86_64"]:
         install-commands:
           (>):
           - mkdir -p "%{install-root}/usr/lib64"
diff --git a/elements/gnu-toolchain/gcc.bst b/elements/gnu-toolchain/gcc.bst
index 37f7a5b6..c0f09065 100644
--- a/elements/gnu-toolchain/gcc.bst
+++ b/elements/gnu-toolchain/gcc.bst
@@ -35,7 +35,7 @@ variables:
                         --with-fpu=vfpv3-d16
                         --with-float=hard
 
-    - arch in ["armv8b64", "armv8l64", "ppc64b", "ppc64l", "x86_64"]:
+    - arch in ["armv8b", "armv8l", "ppc64", "ppc64le", "x86_64"]:
         lib: lib64
 
 environment:
diff --git a/elements/gnu-toolchain/glibc.bst b/elements/gnu-toolchain/glibc.bst
index 73408726..dd020728 100644
--- a/elements/gnu-toolchain/glibc.bst
+++ b/elements/gnu-toolchain/glibc.bst
@@ -19,7 +19,7 @@ variables:
     - arch.startswith("armv7"):
         glibc-arch-flags: --without-fp
 
-    - arch in ["armv8b64", "armv8l64", "ppc64b", "ppc64l", "x86_64"]:
+    - arch in ["armv8b", "armv8l", "ppc64", "ppc64le", "x86_64"]:
         # Setting this will affect BuildStream's default %{libdir} which
         # affects the built-in split rules.
         lib: "lib64"
diff --git a/elements/gnu-toolchain/linux-api-headers.bst b/elements/gnu-toolchain/linux-api-headers.bst
index aefe8a5b..ff916177 100644
--- a/elements/gnu-toolchain/linux-api-headers.bst
+++ b/elements/gnu-toolchain/linux-api-headers.bst
@@ -16,9 +16,9 @@ variables:
   (?):
     - arch in ["armv5", "armv7b", "armv7l", "armv7lhf"]:
         kernel-arch: arm
-    - arch in ["armv8b64", "armv8l64"]:
+    - arch in ["armv8b", "armv8l"]:
         kernel-arch: arm64
-    - arch in ["ppc64b", "ppc64l"]:
+    - arch in ["ppc64", "ppc64le"]:
         kernel-arch: powerpc
     - arch == "x86_32":
         kernel-arch: i386
diff --git a/elements/gnu-toolchain/stage2-fhs-dirs.bst b/elements/gnu-toolchain/stage2-fhs-dirs.bst
index 128f2f6c..d51fcb1c 100644
--- a/elements/gnu-toolchain/stage2-fhs-dirs.bst
+++ b/elements/gnu-toolchain/stage2-fhs-dirs.bst
@@ -33,7 +33,7 @@ config:
   # Most 64 bit architectures need a /lib64 symlink as well as /lib.
   # FIXME: the create-fhs-dirs script should probably handle this...
   (?):
-    - arch in ["armv8b64", "armv8l64", "ppc64l", "ppc64b", "x86_64"]:
+    - arch in ["armv8b", "armv8l", "ppc64le", "ppc64", "x86_64"]:
         install-commands:
           (>):
           - mkdir -p "%{install-root}/usr/lib64"
diff --git a/elements/gnu-toolchain/stage2-gcc.bst b/elements/gnu-toolchain/stage2-gcc.bst
index 5751631a..c258b43d 100644
--- a/elements/gnu-toolchain/stage2-gcc.bst
+++ b/elements/gnu-toolchain/stage2-gcc.bst
@@ -38,7 +38,7 @@ variables:
 
     # GCC is hardwired to support 32-bit and 64-bit in parallel on these
     # platforms, so 64-bit libraries end up in `lib64` rather than `lib`.
-    - arch in ["armv8b64", "armv8l64", "x86_64"]:
+    - arch in ["armv8b", "armv8l", "x86_64"]:
         gcc-libdir: lib64
 
 environment:
diff --git a/elements/gnu-toolchain/stage2-glibc.bst b/elements/gnu-toolchain/stage2-glibc.bst
index 296fdcf6..e64af939 100644
--- a/elements/gnu-toolchain/stage2-glibc.bst
+++ b/elements/gnu-toolchain/stage2-glibc.bst
@@ -24,14 +24,14 @@ variables:
     - arch.startswith("armv7"):
         glibc-arch-flags: --without-fp
 
-    - arch in ["armv8b64", "armv8l64"]:
+    - arch in ["armv8b", "armv8l"]:
         glibc-ld-so-name: ld-linux-aarch64.so.1
 
-    - arch == "ppc64b":
+    - arch == "ppc64":
         glibc-ld-so-name: ld64.so.1
         glibc-ld-so-libdir: lib64
 
-    - arch == "ppc64l":
+    - arch == "ppc64le":
         glibc-ld-so-name: ld64.so.2
         glibc-ld-so-libdir: lib64
 
diff --git a/elements/gnu-toolchain/stage2-linux-api-headers.bst b/elements/gnu-toolchain/stage2-linux-api-headers.bst
index 0016cef8..ebdb4046 100644
--- a/elements/gnu-toolchain/stage2-linux-api-headers.bst
+++ b/elements/gnu-toolchain/stage2-linux-api-headers.bst
@@ -17,9 +17,9 @@ variables:
   (?):
     - arch in ["armv5", "armv7b", "armv7l", "armv7lhf"]:
         kernel-arch: arm
-    - arch in ["armv8b64", "armv8l64"]:
+    - arch in ["armv8b", "armv8l"]:
         kernel-arch: arm64
-    - arch in ["ppc64b", "ppc64l"]:
+    - arch in ["ppc64", "ppc64le"]:
         kernel-arch: powerpc
     - arch == "x86_32":
         kernel-arch: i386
-- 
cgit v1.2.1