GNOME.org
 

[gnome-build-meta/alatiera/3-30-15] update for the change to i686 in freedesktop-sdk

commit 36f1cb5419c870d10fa68e8d41e056ec802a8ed6
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sun Oct 28 09:17:16 2018 +0100

    update for the change to i686 in freedesktop-sdk

 .gitlab-ci.yml                       | 10 +++++++---
 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/gst-plugins-bad.bst     |  4 ++--
 elements/sdk/gst-plugins-good.bst    |  4 ++--
 elements/sdk/mozjs60.bst             |  4 ++--
 files/webkitgtk/toolchain.i386       |  2 +-
 project.conf                         |  9 +++------
 16 files changed, 29 insertions(+), 31 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a82ead4..4e414a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,10 +96,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,
@@ -132,6 +132,7 @@ build-flatpak-runtimes-x86_64:
     - progress
   variables:
     ARCH: x86_64
+    FLATPAK_ARCH: x86_64
 
 build-flatpak-runtimes-i386:
   image: buildstream/buildstream-fedora:master-113-499df6a5
@@ -139,7 +140,8 @@ build-flatpak-runtimes-i386:
   tags:
     - do
   variables:
-    ARCH: i386
+    ARCH: i686
+    FLATPAK_ARCH: i386
 
 build-flatpak-runtimes-aarch64:
   image: buildstream/buildstream-fedora:aarch64-master-113-499df6a5
@@ -148,6 +150,7 @@ build-flatpak-runtimes-aarch64:
     - aarch64
   variables:
     ARCH: aarch64
+    FLATPAK_ARCH: aarch64
 
 build-flatpak-runtimes-arm:
   image: buildstream/buildstream-fedora:aarch64-master-113-499df6a5
@@ -156,6 +159,7 @@ build-flatpak-runtimes-arm:
     - armhf
   variables:
     ARCH: arm
+    FLATPAK_ARCH: arm
 
 .build-template: &build
   stage: build
diff --git a/elements/core-deps/mozjs52.bst b/elements/core-deps/mozjs52.bst
index f0a7761..3acb50b 100644
--- a/elements/core-deps/mozjs52.bst
+++ b/elements/core-deps/mozjs52.bst
@@ -9,8 +9,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 cf7442d..774413b 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -7,6 +7,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 3063987..ae9b384 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -40,7 +40,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 5efea46..9dee7c0 100644
--- a/elements/sdk/ffmpeg.bst
+++ b/elements/sdk/ffmpeg.bst
@@ -33,7 +33,7 @@ variables:
   ffmpeg-libdir: "%{libdir}"
   ffmpeg-arch: "%{arch}"
   (?):
-  - arch == "i386":
+  - arch == "i686":
         ffmpeg-arch: x86
 
   conf-local: |
diff --git a/elements/sdk/gst-plugins-bad.bst b/elements/sdk/gst-plugins-bad.bst
index 3d07e05..d8d7988 100644
--- a/elements/sdk/gst-plugins-bad.bst
+++ b/elements/sdk/gst-plugins-bad.bst
@@ -49,8 +49,8 @@ depends:
 variables:
   host: ''
   (?):
-  - arch == "i386":
-      host: --host=i586-unknown-linux-gnu
+  - arch == "i686":
+      host: --host=i686-unknown-linux-gnu
   - arch == "arm":
       host: --host=arm-unknown-linux-gnueabi
   conf-local: |
diff --git a/elements/sdk/gst-plugins-good.bst b/elements/sdk/gst-plugins-good.bst
index 8503c75..9c34a98 100644
--- a/elements/sdk/gst-plugins-good.bst
+++ b/elements/sdk/gst-plugins-good.bst
@@ -31,8 +31,8 @@ depends:
 variables:
   host: ''
   (?):
-  - arch == "i386":
-      host: --host=i586-unknown-linux-gnu
+  - arch == "i686":
+      host: --host=i686-unknown-linux-gnu
   - arch == "arm":
       host: --host=arm-unknown-linux-gnueabi
   conf-local: |
diff --git a/elements/sdk/mozjs60.bst b/elements/sdk/mozjs60.bst
index a0b74ec..56650f7 100644
--- a/elements/sdk/mozjs60.bst
+++ b/elements/sdk/mozjs60.bst
@@ -13,8 +13,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 60c746c..d10a3e1 100644
--- a/project.conf
+++ b/project.conf
@@ -24,8 +24,6 @@ options:
     values:
     - arm
     - aarch64
-    - i386
-    - i586
     - i686
     - x86_64
 
@@ -187,8 +185,9 @@ shell:
 
 variables:
   branch: "3.30"
+  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"
@@ -197,10 +196,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]