GNOME.org
 

[gnome-build-meta] update for the change to i686 in freedesktop-sdk

commit 8a67e67f9166bc01b6cb998bafeb67e94f9c5cfa
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Mon Oct 29 17:22:12 2018 +0100

    update for the change to i686 in freedesktop-sdk

 .gitlab-ci.yml                       | 12 ++++++++----
 elements/core-deps/mozjs52.bst       |  4 ++--
 elements/flatpak/platform-locale.bst |  2 +-
 elements/flatpak/platform.bst        |  4 ++--
 elements/flatpak/sdk-debug.bst       |  2 +-
 elements/flatpak/sdk-docs.bst        |  2 +-
 elements/flatpak/sdk-locale.bst      |  2 +-
 elements/flatpak/sdk.bst             |  4 ++--
 elements/freedesktop-sdk.bst         |  3 ---
 elements/sdk/WebKitGTK+.bst          |  2 +-
 elements/sdk/ffmpeg.bst              |  2 +-
 elements/sdk/mozjs60.bst             |  4 ++--
 files/webkitgtk/toolchain.i386       |  2 +-
 project.conf                         |  9 +++------
 14 files changed, 26 insertions(+), 28 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4719048..5a1bd43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,10 +116,10 @@ before_script:
     - |
       for runtime in platform platform-locale sdk sdk-debug sdk-docs sdk-locale; do
         bst -o arch "${ARCH}" checkout --hardlinks "flatpak/${runtime}.bst" "runtimes/${runtime}"
-        flatpak build-export --arch="${ARCH}" --no-update-summary --files=files repo/ "runtimes/${runtime}" 
"${FLATPAK_BRANCH}"
+        flatpak build-export --arch="${FLATPAK_ARCH}" --no-update-summary --files=files repo/ 
"runtimes/${runtime}" "${FLATPAK_BRANCH}"
       done
 
-    - BRANCHES=$(find repo/refs/heads/ -type f | grep "${ARCH}/${FLATPAK_BRANCH}" | sed s,repo/refs/heads/,,)
+    - BRANCHES=$(find repo/refs/heads/ -type f | grep "${FLATPAK_ARCH}/${FLATPAK_BRANCH}" | sed 
s,repo/refs/heads/,,)
 
     # Push the resulting runtimes to gbm.gnome.org
     # Assume there will be no branch name collisions,
@@ -176,7 +176,7 @@ build-gnome-core-i386:
   tags:
     - do
   variables:
-    ARCH: i386
+    ARCH: i686
   allow_failure: true
 
 build-gnome-core-aarch64:
@@ -204,6 +204,7 @@ flatpak-x86_64:
     - do
   variables:
     ARCH: x86_64
+    FLATPAK_ARCH: x86_64
 
 flatpak-i386:
   image: buildstream/buildstream-fedora:master-113-499df6a5
@@ -211,7 +212,8 @@ flatpak-i386:
   tags:
     - do
   variables:
-    ARCH: i386
+    ARCH: i686
+    FLATPAK_ARCH: i386
 
 flatpak-aarch64:
   image: buildstream/buildstream-fedora:aarch64-master-113-499df6a5
@@ -220,6 +222,7 @@ flatpak-aarch64:
     - aarch64
   variables:
     ARCH: aarch64
+    FLATPAK_ARCH: aarch64
 
 flatpak-arm:
   image: buildstream/buildstream-fedora:aarch64-master-113-499df6a5
@@ -228,3 +231,4 @@ flatpak-arm:
     - armhf
   variables:
     ARCH: arm
+    FLATPAK_ARCH: arm
diff --git a/elements/core-deps/mozjs52.bst b/elements/core-deps/mozjs52.bst
index 3aa9018..9d687e5 100644
--- a/elements/core-deps/mozjs52.bst
+++ b/elements/core-deps/mozjs52.bst
@@ -8,8 +8,8 @@ depends:
 variables:
   mozjs_target: ''
   (?):
-    - arch == "i386":
-        mozjs_target: "--host=i586-unknown-linux-gnu"
+    - arch == "i686":
+        mozjs_target: "--host=i686-unknown-linux-gnu"
     - arch == "arm":
         mozjs_target: "--host=arm-unknown-linux-gnueabi"
   command-subdir: _build
diff --git a/elements/flatpak/platform-locale.bst b/elements/flatpak/platform-locale.bst
index f52c377..072d52d 100644
--- a/elements/flatpak/platform-locale.bst
+++ b/elements/flatpak/platform-locale.bst
@@ -9,4 +9,4 @@ config:
       name: org.gnome.Platform.Locale
 
     ExtensionOf:
-      ref: runtime/org.gnome.Platform/%{arch}/%{branch}
+      ref: runtime/org.gnome.Platform/%{gcc_arch}/%{branch}
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 8e733a0..8481928 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -11,8 +11,8 @@ config:
   metadata:
     Runtime:
       name: org.gnome.Platform
-      runtime: org.gnome.Platform/%{arch}/%{branch}
-      sdk: org.gnome.Sdk/%{arch}/%{branch}
+      runtime: org.gnome.Platform/%{gcc_arch}/%{branch}
+      sdk: org.gnome.Sdk/%{gcc_arch}/%{branch}
 
     Environment:
       GI_TYPELIB_PATH: /app/lib/girepository-1.0
diff --git a/elements/flatpak/sdk-debug.bst b/elements/flatpak/sdk-debug.bst
index 4f2c6ad..7b4db59 100644
--- a/elements/flatpak/sdk-debug.bst
+++ b/elements/flatpak/sdk-debug.bst
@@ -9,5 +9,5 @@ config:
       name: org.gnome.Sdk.Debug
 
     ExtensionOf:
-      ref: runtime/org.gnome.Sdk/%{arch}/%{branch}
+      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{branch}
 
diff --git a/elements/flatpak/sdk-docs.bst b/elements/flatpak/sdk-docs.bst
index 800297f..dbf2033 100644
--- a/elements/flatpak/sdk-docs.bst
+++ b/elements/flatpak/sdk-docs.bst
@@ -9,5 +9,5 @@ config:
       name: org.gnome.Sdk.Docs
 
     ExtensionOf:
-      ref: runtime/org.gnome.Sdk/%{arch}/%{branch}
+      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{branch}
 
diff --git a/elements/flatpak/sdk-locale.bst b/elements/flatpak/sdk-locale.bst
index 8e6382b..d981a1f 100644
--- a/elements/flatpak/sdk-locale.bst
+++ b/elements/flatpak/sdk-locale.bst
@@ -9,4 +9,4 @@ config:
       name: org.gnome.Sdk.Locale
 
     ExtensionOf:
-      ref: runtime/org.gnome.Sdk/%{arch}/%{branch}
+      ref: runtime/org.gnome.Sdk/%{gcc_arch}/%{branch}
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index 008e6e7..afb0254 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -11,8 +11,8 @@ config:
   metadata:
     Runtime:
       name: org.gnome.Sdk
-      runtime: org.gnome.Platform/%{arch}/%{branch}
-      sdk: org.gnome.Sdk/%{arch}/%{branch}
+      runtime: org.gnome.Platform/%{gcc_arch}/%{branch}
+      sdk: org.gnome.Sdk/%{gcc_arch}/%{branch}
 
     Environment:
       GI_TYPELIB_PATH: /app/lib/girepository-1.0
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 30a7a0e..d676dbb 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -6,6 +6,3 @@ sources:
 config:
   options:
     target_arch: '%{arch}'
-    (?):
-    - arch == 'i386':
-        target_arch: i586
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
index 8ecd602..335623c 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -39,7 +39,7 @@ depends:
 variables:
   webkitgtk_toolchain: ''
   (?):
-    - arch == "i386":
+    - arch == "i686":
         webkitgtk_toolchain: -DCMAKE_TOOLCHAIN_FILE=toolchain.i386
     - arch == "arm":
         webkitgtk_toolchain: -DCMAKE_TOOLCHAIN_FILE=toolchain.arm
diff --git a/elements/sdk/ffmpeg.bst b/elements/sdk/ffmpeg.bst
index 9cbe4d0..a2a618f 100644
--- a/elements/sdk/ffmpeg.bst
+++ b/elements/sdk/ffmpeg.bst
@@ -32,7 +32,7 @@ variables:
   ffmpeg-libdir: "%{libdir}"
   ffmpeg-arch: "%{arch}"
   (?):
-  - arch == "i386":
+  - arch == "i686":
         ffmpeg-arch: x86
 
   conf-local: |
diff --git a/elements/sdk/mozjs60.bst b/elements/sdk/mozjs60.bst
index fb1ea2b..ccef040 100644
--- a/elements/sdk/mozjs60.bst
+++ b/elements/sdk/mozjs60.bst
@@ -12,8 +12,8 @@ depends:
 variables:
   mozjs_target: ''
   (?):
-    - arch == "i386":
-        mozjs_target: "--host=i586-unknown-linux-gnu"
+    - arch == "i686":
+        mozjs_target: "--host=i686-unknown-linux-gnu"
     - arch == "arm":
         mozjs_target: "--host=arm-unknown-linux-gnueabi"
   command-subdir: _build
diff --git a/files/webkitgtk/toolchain.i386 b/files/webkitgtk/toolchain.i386
index e4b85de..2a2f3c0 100644
--- a/files/webkitgtk/toolchain.i386
+++ b/files/webkitgtk/toolchain.i386
@@ -1,2 +1,2 @@
 set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR i586)
+set(CMAKE_SYSTEM_PROCESSOR i686)
diff --git a/project.conf b/project.conf
index 9b8a380..3adf089 100644
--- a/project.conf
+++ b/project.conf
@@ -27,8 +27,6 @@ options:
     values:
     - arm
     - aarch64
-    - i386
-    - i586
     - i686
     - x86_64
 
@@ -190,8 +188,9 @@ shell:
 
 variables:
   branch: master
+  gcc_arch: "%{arch}"
   abi: "gnu"
-  gcc_triplet: "%{arch}-linux-%{abi}"
+  gcc_triplet: "%{gcc_arch}-linux-%{abi}"
   lib: "lib/%{gcc_triplet}"
   sbindir: "%{bindir}"
   sysconfdir: "%{prefix}/etc"
@@ -200,10 +199,8 @@ variables:
   debugdir: "%{indep-libdir}/debug"
 
   (?):
-    - arch == "i586":
-        arch: "i386"
     - arch == "i686":
-        arch: "i386"
+        gcc_arch: "i386"
     - arch == "arm":
         abi: "gnueabihf"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]