summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libproxy
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-09 16:34:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:48 +0000
commit3bdeda543785fca512ff54bc85c5fd5988a5b232 (patch)
tree1c622a78899c3308f03f4c3370f8f532722ee7b6 /meta/recipes-support/libproxy
parent86994fdf6fb8faf1c2985154543d56b9a6ac11e5 (diff)
downloadpoky-3bdeda543785fca512ff54bc85c5fd5988a5b232.tar.gz
libproxy: remove GPLv3 logic and spurious exports
The GPLv3 logic was added back when gnome-common was GPLv3 but that has since been fixed so the logic can be removed. Also remove the export of HOST_SYS and BUILD_SYS (added in 397793) as cmake works fine without them. (From OE-Core rev: 71382cb226129c7991a82e37f3e8723042608546) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libproxy')
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.11.bb11
1 files changed, 1 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 11a23b143f..8cc90bb8e7 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
@@ -17,11 +17,7 @@ SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe48
17 17
18inherit cmake pkgconfig 18inherit cmake pkgconfig
19 19
20PACKAGECONFIG ?= " \ 20PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3"
21 ${@ '' if incompatible_license_contains('GPLv3', 'x', '', d) == 'x' or bb.utils.contains('DISTRO_FEATURES', 'x11', 'x', '', d) == '' else 'gnome' } \
22 gnome3 \
23"
24
25PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" 21PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf"
26PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" 22PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no"
27 23
@@ -36,10 +32,5 @@ EXTRA_OECMAKE += " \
36 -DLIBEXEC_INSTALL_DIR=${libexecdir} \ 32 -DLIBEXEC_INSTALL_DIR=${libexecdir} \
37" 33"
38 34
39do_configure_prepend() {
40 export HOST_SYS=${HOST_SYS}
41 export BUILD_SYS=${BUILD_SYS}
42}
43
44FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" 35FILES_${PN} += "${libdir}/${BPN}/${PV}/modules"
45FILES_${PN}-dev += "${datadir}/cmake" 36FILES_${PN}-dev += "${datadir}/cmake"