[gnome-build-meta/abderrahim/32bit-compat: 4/4] flatpak-runtimes.bst: restrict what should be built by architecture
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/32bit-compat: 4/4] flatpak-runtimes.bst: restrict what should be built by architecture
- Date: Mon, 2 Sep 2019 10:48:48 +0000 (UTC)
commit 5cf1373b3fcae86967b8cbd295605a319fa5f082
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Mon Sep 2 11:31:08 2019 +0100
flatpak-runtimes.bst: restrict what should be built by architecture
- don't build platform and sdk on i686 (dropped by freedesktop-sdk)
- build platform compat extensions on 32 bit only
- don't build sdk compat on x86_64
elements/flatpak-runtimes.bst | 55 +++++++++++++++++++++++++++----------------
1 file changed, 35 insertions(+), 20 deletions(-)
---
diff --git a/elements/flatpak-runtimes.bst b/elements/flatpak-runtimes.bst
index 8717629c..da6b7016 100644
--- a/elements/flatpak-runtimes.bst
+++ b/elements/flatpak-runtimes.bst
@@ -1,28 +1,43 @@
kind: flatpak_repo
depends:
-- filename: flatpak/platform.bst
- type: build
-- filename: flatpak/platform-locale.bst
- type: build
-- filename: flatpak/platform-arch-libs.bst
- type: build
-- filename: flatpak/platform-arch-libs-debug.bst
- type: build
-- filename: flatpak/sdk.bst
- type: build
-- filename: flatpak/sdk-debug.bst
- type: build
-- filename: flatpak/sdk-docs.bst
- type: build
-- filename: flatpak/sdk-locale.bst
- type: build
-- filename: flatpak/sdk-arch-libs.bst
- type: build
-- filename: flatpak/sdk-arch-libs-debug.bst
- type: build
- filename: deploy-tools/flatpak.bst
junction: freedesktop-sdk.bst
type: build
+(?):
+# platform and sdk should not be built on i686
+- arch != 'i686':
+ depends:
+ (>):
+ - filename: flatpak/platform.bst
+ type: build
+ - filename: flatpak/platform-locale.bst
+ type: build
+ - filename: flatpak/sdk.bst
+ type: build
+ - filename: flatpak/sdk-debug.bst
+ type: build
+ - filename: flatpak/sdk-docs.bst
+ type: build
+ - filename: flatpak/sdk-locale.bst
+ type: build
+
+# platform compat is only built on 32 bit
+- arch in ('i686', 'arm'):
+ depends:
+ (>):
+ - filename: flatpak/platform-arch-libs.bst
+ type: build
+ - filename: flatpak/platform-arch-libs-debug.bst
+ type: build
+
+# sdk compat is not built on x86_64
+- arch != 'x86_64':
+ depends:
+ (>):
+ - filename: flatpak/sdk-arch-libs.bst
+ type: build
+ - filename: flatpak/sdk-arch-libs-debug.bst
+ type: build
config:
environment:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]