diff options
| author | Jeff Dike <jdike@x86_64.user-mode-linux.org> | 2010-07-21 13:20:40 -0400 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-21 21:23:21 +0100 |
| commit | 0e0830109cea38de17a589ec2fd3a9184f489087 (patch) | |
| tree | 6c89d2f770da2da2f8d6bafcdb73571e0f8d5740 | |
| parent | 314fbb1c0519e5c9b44f35915dc346e0b7166e8e (diff) | |
| download | openembedded-core-0e0830109cea38de17a589ec2fd3a9184f489087.tar.gz openembedded-core-0e0830109cea38de17a589ec2fd3a9184f489087.tar.bz2 openembedded-core-0e0830109cea38de17a589ec2fd3a9184f489087.zip | |
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 <jdike@linux.intel.com>
| -rw-r--r-- | meta/classes/cmake.bbclass | 2 | ||||
| -rw-r--r-- | 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/" |