From 0e0830109cea38de17a589ec2fd3a9184f489087 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Wed, 21 Jul 2010 13:20:40 -0400 Subject: libproxy: Disabled webkit support This package changed from autoconf to cmake during the last recipe upgrade. This made the existing EXTRA_OECONF, which disabled wekbit support among other things, non-functional, which in turn, broke the build. This patch disables webkit in a CMAKE way by adding EXTRA_OECMAKE to the cmake class description, and setting it to "-DWEBKIT=no" in the libproxy recipe and also reproduces the EXTRA_OECONF settings. Signed-off-by: Jeff Dike --- meta/classes/cmake.bbclass | 2 +- meta/packages/libproxy/libproxy_0.4.2.bb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index a9130f2a05..b972bd0037 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -5,7 +5,7 @@ inherit autotools cmake_do_configure() { cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \ - -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} + -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} ${EXTRA_OECMAKE} } EXPORT_FUNCTIONS do_configure diff --git a/meta/packages/libproxy/libproxy_0.4.2.bb b/meta/packages/libproxy/libproxy_0.4.2.bb index 61595f64e9..c858b514d9 100644 --- a/meta/packages/libproxy/libproxy_0.4.2.bb +++ b/meta/packages/libproxy/libproxy_0.4.2.bb @@ -11,11 +11,12 @@ DEPENDS = "virtual/libx11 xmu gconf-dbus" SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz" -PR = "r0" +PR = "r1" inherit cmake pkgconfig -EXTRA_OECONF = "--without-kde --with-gnome --without-webkit --without-python --without-mozjs --without-networkmanager" +EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \ + -DWITH_PYTHON=no -DWITH_MOZJS=no -DWITH_NM=no" FILES_${PN}-dbg += "${libdir}/libproxy/0.4.2/plugins/" -- cgit v1.2.3-54-g00ecf