[jhbuild] config: add condition flags for 'darwin'
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] config: add condition flags for 'darwin'
- Date: Wed, 31 Dec 2014 01:54:51 +0000 (UTC)
commit 2392352755f9284fbfb338d933b249f20dda8c14
Author: Ryan Lortie <desrt desrt ca>
Date: Sun Dec 28 00:08:29 2014 -0500
config: add condition flags for 'darwin'
Detect 'darwin' in sys.platform and assume that it means that we're on
Mac OS X.
Define new condition flags 'darwin', 'macos', and 'quartz' for that.
We already refer to the 'macos' condition in the bootstrap moduleset but
so far it had never been defined.
The intention is that 'macos' will be used for expectations about the
software available in the system (and what needs to be bootstrapped) and
that 'quartz' will refer to the window system. It would theoretically
make sense to disable 'quartz' and enable 'x11' if one wanted to use the
X server on macos, for example.
We additionally add a 'gnu-elf' condition for systems that have
GNU-style binutils (which accept -Bsymbolic, for example).
jhbuild/config.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/config.py b/jhbuild/config.py
index f1e37b6..81c7797 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -88,8 +88,9 @@ def get_default_conditions():
# of 'freebsd') then we just need to make sure the more-specific one
# comes first in the list
conditions_sets = [
- ('linux', ['linux', 'wayland', 'udev', 'x11', 'systemd']),
- ('freebsd', ['freebsd', 'x11', 'bsd']),
+ ('linux', ['linux', 'wayland', 'udev', 'x11', 'systemd', 'gnu-elf']),
+ ('freebsd', ['freebsd', 'x11', 'bsd', 'gnu-elf']),
+ ('darwin', ['darwin', 'macos', 'quartz']),
# this must be left here so that at least one will be found
('', ['x11'])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]