kconfig: add Upstream-Status to patches / share EXTRA_OECMAKE for cross/native

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2014-11-27 09:43:38 +01:00
parent 56b3206c84
commit e32534f62b
5 changed files with 6 additions and 4 deletions

View File

@@ -8,6 +8,8 @@ Content-Transfer-Encoding: 8bit
this is required for pure wayland environments
Upstream-Status: Inappropriate [config]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 4 +++-

View File

@@ -6,6 +6,8 @@ MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [config]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 6 +++++-

View File

@@ -1,5 +1,3 @@
require ${BPN}.inc
inherit native
EXTRA_OECMAKE += "-DAUTOTESTS=OFF -DSESSION_MANAGEMENT=OFF"

View File

@@ -4,8 +4,6 @@ inherit cmake-lib
DEPENDS += "${BPN}-native"
EXTRA_OECMAKE += "-DAUTOTESTS=OFF -DSESSION_MANAGEMENT=${@base_contains("DISTRO_FEATURES", "x11", "ON", "OFF", d)}"
# cross libs / headers
CMAKE_HIDE_ERROR[1] = "KF5Config, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_HIDE_ERROR[2] = "KF5Config, -S${includedir}, -S${STAGING_INCDIR}"

View File

@@ -13,6 +13,8 @@ SRC_URI += " \
SRCREV = "f844f6a85e4bce35d0802eed11b19916d34ed78c"
PV = "5.5.0"
EXTRA_OECMAKE += "-DAUTOTESTS=OFF -DSESSION_MANAGEMENT=${@base_contains("DISTRO_FEATURES", "x11", "ON", "OFF", d)}"
PACKAGES =+ "${PN}-bin"
FILES_${PN}-dbg += "${libdir}/kconfig/kf5/.debug"