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.

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
index 11a23b143f077838dc6502b6f01eba660f4b7b07..8cc90bb8e7aa0d6773f2d05a5060838fc951c789 100644 (file)
--- 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
 
 inherit cmake pkgconfig
 
-PACKAGECONFIG ?= " \
-    ${@ '' if incompatible_license_contains('GPLv3', 'x', '', d) == 'x' or bb.utils.contains('DISTRO_FEATURES', 'x11', 'x', '', d) == '' else 'gnome' } \
-    gnome3 \
-"
-
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3"
 PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf"
 PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no"
 
@@ -36,10 +32,5 @@ EXTRA_OECMAKE += " \
     -DLIBEXEC_INSTALL_DIR=${libexecdir} \
 "
 
-do_configure_prepend() {
-       export HOST_SYS=${HOST_SYS}
-       export BUILD_SYS=${BUILD_SYS}
-}
-
 FILES_${PN} += "${libdir}/${BPN}/${PV}/modules"
 FILES_${PN}-dev += "${datadir}/cmake"