diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2013-03-07 18:42:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-10 04:36:51 +0000 |
commit | fb9bd465fa8fe0ff8bd1ff6a061459758ed488d2 (patch) | |
tree | b246ab8719ad76ba33170c8ae8fb74781dd8e42d /meta | |
parent | 1905f253d2cca22dddb47fcdd3709c3f18f1a8b3 (diff) | |
download | poky-fb9bd465fa8fe0ff8bd1ff6a061459758ed488d2.tar.gz |
libsoup-2.4: make libsoup-gnome optional
* Weakens dependency on libgnome-keyring and sqlite3
* Defaults to no if x11 is in DISTRO_FEATURES
(From OE-Core rev: 8a5d0a2be41c1a0471456a1098270632521c0c9f)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb index 9274f8c046..53807af3e5 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb | |||
@@ -5,11 +5,14 @@ BUGTRACKER = "https://bugzilla.gnome.org/" | |||
5 | LICENSE = "LGPLv2" | 5 | LICENSE = "LGPLv2" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" |
7 | 7 | ||
8 | PR = "r0" | 8 | PR = "r1" |
9 | 9 | ||
10 | SECTION = "x11/gnome/libs" | 10 | SECTION = "x11/gnome/libs" |
11 | 11 | ||
12 | DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 libgnome-keyring" | 12 | DEPENDS = "glib-2.0 gnutls libxml2 libproxy" |
13 | |||
14 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)}" | ||
15 | PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,libgnome-keyring sqlite3" | ||
13 | 16 | ||
14 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | 17 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" |
15 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" | 18 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" |