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 /meta/packages/libproxy | |
parent | 314fbb1c0519e5c9b44f35915dc346e0b7166e8e (diff) | |
download | poky-0e0830109cea38de17a589ec2fd3a9184f489087.tar.gz |
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>
Diffstat (limited to 'meta/packages/libproxy')
-rw-r--r-- | meta/packages/libproxy/libproxy_0.4.2.bb | 5 |
1 files changed, 3 insertions, 2 deletions
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" | |||
11 | 11 | ||
12 | SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz" | 12 | SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz" |
13 | 13 | ||
14 | PR = "r0" | 14 | PR = "r1" |
15 | 15 | ||
16 | inherit cmake pkgconfig | 16 | inherit cmake pkgconfig |
17 | 17 | ||
18 | EXTRA_OECONF = "--without-kde --with-gnome --without-webkit --without-python --without-mozjs --without-networkmanager" | 18 | EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \ |
19 | -DWITH_PYTHON=no -DWITH_MOZJS=no -DWITH_NM=no" | ||
19 | 20 | ||
20 | FILES_${PN}-dbg += "${libdir}/libproxy/0.4.2/plugins/" | 21 | FILES_${PN}-dbg += "${libdir}/libproxy/0.4.2/plugins/" |
21 | 22 | ||