summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-08 12:34:40 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:48 +0000
commit033d754282314761c8bda7273b0e4a83462579d7 (patch)
tree0dbdac49f72c9f1d0f851f0334a0c9235245b4cc /meta
parente65a29e3119030775e37bcc23374285d30a61245 (diff)
downloadpoky-033d754282314761c8bda7273b0e4a83462579d7.tar.gz
libproxy: replace PACKAGECONFIG equivalent with the real thing
No change in functionality, just use PACKAGECONFIG instead of python. (From OE-Core rev: 30318b91a5a40bc4021c1a81381f292238f6d268) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.11.bb29
1 files changed, 19 insertions, 10 deletions
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
index 9db52317bb..a5238573e7 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
@@ -6,29 +6,38 @@ LICENSE = "LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
7 file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" 7 file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
8 8
9DEPENDS = "gconf glib-2.0" 9DEPENDS = "glib-2.0"
10 10
11SRC_URI = "${DEBIAN_MIRROR}/main/libp/${BPN}/${BPN}_${PV}.orig.tar.gz \ 11SRC_URI = "${DEBIAN_MIRROR}/main/libp/${BPN}/${BPN}_${PV}.orig.tar.gz \
12 file://0001-test-Include-sys-select.h-for-select.patch \ 12 file://0001-test-Include-sys-select.h-for-select.patch \
13 " 13 "
14
14SRC_URI[md5sum] = "3cd1ae2a4abecf44b3f24d6639d2cd84" 15SRC_URI[md5sum] = "3cd1ae2a4abecf44b3f24d6639d2cd84"
15SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b" 16SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b"
16 17
17inherit cmake pkgconfig 18inherit cmake pkgconfig
18 19
19EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \ 20PACKAGECONFIG ?= " \
20 -DWITH_PYTHON=no -DWITH_PERL=no -DWITH_MOZJS=no -DWITH_NM=no -DLIB_INSTALL_DIR=${libdir} -DLIBEXEC_INSTALL_DIR=${libexecdir}" 21 ${@ '' if incompatible_license_contains('GPLv3', 'x', '', d) == 'x' or bb.utils.contains('DISTRO_FEATURES', 'x11', 'x', '', d) == '' else 'gnome' } \
22"
21 23
22FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" 24PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf"
23FILES_${PN}-dev += "${datadir}/cmake" 25
26EXTRA_OECMAKE += " \
27 -DWITH_KDE4=no \
28 -DWITH_MOZJS=no \
29 -DWITH_NM=no \
30 -DWITH_PERL=no \
31 -DWITH_PYTHON=no \
32 -DWITH_WEBKIT=no \
33 -DLIB_INSTALL_DIR=${libdir} \
34 -DLIBEXEC_INSTALL_DIR=${libexecdir} \
35"
24 36
25do_configure_prepend() { 37do_configure_prepend() {
26 export HOST_SYS=${HOST_SYS} 38 export HOST_SYS=${HOST_SYS}
27 export BUILD_SYS=${BUILD_SYS} 39 export BUILD_SYS=${BUILD_SYS}
28} 40}
29 41
30python() { 42FILES_${PN} += "${libdir}/${BPN}/${PV}/modules"
31 if incompatible_license_contains("GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": 43FILES_${PN}-dev += "${datadir}/cmake"
32 d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE", False).replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no"))
33 d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS", False).split() if i != "gconf"))
34}