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>
This commit is contained in:
parent
314fbb1c05
commit
0e0830109c
|
@ -5,7 +5,7 @@ inherit autotools
|
||||||
|
|
||||||
cmake_do_configure() {
|
cmake_do_configure() {
|
||||||
cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \
|
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
|
EXPORT_FUNCTIONS do_configure
|
||||||
|
|
|
@ -11,11 +11,12 @@ DEPENDS = "virtual/libx11 xmu gconf-dbus"
|
||||||
|
|
||||||
SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
|
SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
|
||||||
|
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
inherit cmake pkgconfig
|
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/"
|
FILES_${PN}-dbg += "${libdir}/libproxy/0.4.2/plugins/"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue