diff options
-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 | |||
5 | 5 | ||
6 | cmake_do_configure() { | 6 | cmake_do_configure() { |
7 | cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \ | 7 | cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \ |
8 | -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} | 8 | -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} ${EXTRA_OECMAKE} |
9 | } | 9 | } |
10 | 10 | ||
11 | EXPORT_FUNCTIONS do_configure | 11 | 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" | |||
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 | ||