[jhbuild/wip/conditions: 3/4] 3.12: conditionalise some linux-specific features
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild/wip/conditions: 3/4] 3.12: conditionalise some linux-specific features
- Date: Mon, 3 Mar 2014 18:36:08 +0000 (UTC)
commit 7de51b5097e5842dea919226a23630452f26716c
Author: Ryan Lortie <desrt desrt ca>
Date: Mon Mar 3 13:33:10 2014 -0500
3.12: conditionalise some linux-specific features
Turn some features off if the 'linux' condition is not set.
Bonus: enable the 'ports' backend on PackageKit if 'bsd' is set.
modulesets/gnome-suites-core-3.12.modules | 19 +++++++++++++++++++
modulesets/gnome-suites-core-deps-3.12.modules | 6 ++++++
2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.12.modules b/modulesets/gnome-suites-core-3.12.modules
index 499ce20..38d4469 100644
--- a/modulesets/gnome-suites-core-3.12.modules
+++ b/modulesets/gnome-suites-core-3.12.modules
@@ -266,6 +266,9 @@
</autotools>
<autotools id="gnome-settings-daemon">
+ <if condition-unset="linux">
+ <autogenargs value="--disable-rfkill --disable-gudev"/>
+ </if>
<branch/>
<dependencies>
<dep package="colord"/>
@@ -296,6 +299,9 @@
</autotools>
<autotools id="gnome-shell" autogenargs="--enable-compile-warnings=maximum">
+ <if condition-unset="linux">
+ <autogenargs value="--disable-networkmanager"/>
+ </if>
<branch/>
<dependencies>
<dep package="accountsservice"/>
@@ -461,6 +467,9 @@
<autotools id="pulseaudio"
autogenargs="--disable-hal --disable-oss-output --disable-esound --disable-gconf --disable-gtk3
--enable-bluez5">
+ <if condition-unset="linux">
+ <autogenargs value="--disable-bluez4 --disable-bluez5"/>
+ </if>
<branch repo="pulseaudio.freedesktop.org"/>
<dependencies>
<dep package="alsa"/>
@@ -840,6 +849,9 @@
</autotools>
<autotools id="gnome-user-share">
+ <if condition-unset="linux">
+ <autogenargs value="--disable-bluetooth"/>
+ </if>
<branch/>
<dependencies>
<dep package="avahi"/>
@@ -944,6 +956,13 @@
</autotools>
<autotools id="PackageKit" autogenargs="--disable-tests --disable-qt --disable-browser-plugin"
makeargs="CFLAGS=-Wno-error">
+ <if condition-unset="linux">
+ <autogenargs value="--disable-systemd --disable-systemd-updates"/>
+ </if>
+ <if condition-set="bsd">
+ <autogenargs value="--enable-ports"/>
+ </if>
+
<branch repo="packagekit.gitorious.org" checkoutdir="PackageKit" module="packagekit.git"/>
<dependencies>
<dep package="glib"/>
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 24e38ae..686a2e7 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -119,6 +119,9 @@
</autotools>
<autotools id="geoclue">
+ <if condition-unset="linux">
+ <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-wifi-source"/>
+ </if>
<branch repo="git.freedesktop.org"/>
<dependencies>
<dep package="glib"/>
@@ -1322,6 +1325,9 @@
</autotools>
<autotools id="colord" autogenargs="--disable-examples --disable-strict --disable-bash-completion">
+ <if condition-unset="linux">
+ <autogenargs value="--disable-gusb --disable-udev --with-systemdsystemunitdir=no
--disable-systemd-login"/>
+ </if>
<branch repo="github.com" checkoutdir="colord" module="hughsie/colord.git"/>
<dependencies>
<dep package="glib"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]