[gnome-build-meta/alatiera/gst-plugins-bad-more: 4/4] project.conf: pass --host to all autotools elements for i586 and arm
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/alatiera/gst-plugins-bad-more: 4/4] project.conf: pass --host to all autotools elements for i586 and arm
- Date: Mon, 17 Sep 2018 19:42:13 +0000 (UTC)
commit 844f56e3d912f1f60355b30d67f54ed609d6f2a6
Author: Abderrahim Kitouni <a kitouni gmail com>
Date: Mon Sep 17 20:38:11 2018 +0100
project.conf: pass --host to all autotools elements for i586 and arm
elements/core-deps/mozjs52.bst | 8 +-------
elements/sdk/mozjs60.bst | 8 +-------
project.conf | 5 +++++
3 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/elements/core-deps/mozjs52.bst b/elements/core-deps/mozjs52.bst
index f0a7761..06f9b81 100644
--- a/elements/core-deps/mozjs52.bst
+++ b/elements/core-deps/mozjs52.bst
@@ -7,14 +7,8 @@ depends:
- filename: base.bst
junction: freedesktop-sdk.bst
variables:
- mozjs_target: ''
- (?):
- - arch == "i386":
- mozjs_target: "--host=i586-unknown-linux-gnu"
- - arch == "arm":
- mozjs_target: "--host=arm-unknown-linux-gnueabi"
command-subdir: _build
- conf-local: --enable-posix-nspr-emulation --with-system-zlib --with-intl-api --disable-jemalloc
%{mozjs_target}
+ conf-local: --enable-posix-nspr-emulation --with-system-zlib --with-intl-api --disable-jemalloc
AUTOCONF=autoconf
conf-cmd: '%{build-root}/js/src/configure'
# not a real autotools project
diff --git a/elements/sdk/mozjs60.bst b/elements/sdk/mozjs60.bst
index eddb235..6d9a591 100644
--- a/elements/sdk/mozjs60.bst
+++ b/elements/sdk/mozjs60.bst
@@ -11,16 +11,10 @@ depends:
junction: freedesktop-sdk.bst
type: runtime
variables:
- mozjs_target: ''
- (?):
- - arch == "i386":
- mozjs_target: "--host=i586-unknown-linux-gnu"
- - arch == "arm":
- mozjs_target: "--host=arm-unknown-linux-gnueabi"
command-subdir: _build
config:
configure-commands:
- - ../js/src/configure --prefix=%{prefix} --libdir=%{libdir} --disable-jemalloc AUTOCONF=autoconf
%{mozjs_target}
+ - ../js/src/configure --prefix=%{prefix} --libdir=%{libdir} --disable-jemalloc AUTOCONF=autoconf
build-commands:
- make
install-commands:
diff --git a/project.conf b/project.conf
index 60c746c..007a508 100644
--- a/project.conf
+++ b/project.conf
@@ -103,6 +103,11 @@ elements:
fi
# the directory where config.sub and config.guess are stored
conf-aux: .
+ (?):
+ - arch == "i386":
+ conf-global: --host=i586-unknown-linux-gnu
+ - arch == "arm":
+ conf-global: --host=arm-unknown-linux-gnueabi
cmake:
variables:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]