kactivitymanagerd: initial add 5.6.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -0,0 +1,62 @@
|
||||
From 08e119b0775333ddf912ef7e724f9aa7e8cfd0c1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 5 Dec 2014 10:41:28 +0100
|
||||
Subject: [PATCH] replace try_run by try_compile in compiler feature check
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
try_run does not work in cross environments
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
cmake/modules/CheckCxxFeatures.cmake | 17 +++++------------
|
||||
1 file changed, 5 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/CheckCxxFeatures.cmake b/cmake/modules/CheckCxxFeatures.cmake
|
||||
index 95b9542..e751113 100644
|
||||
--- a/cmake/modules/CheckCxxFeatures.cmake
|
||||
+++ b/cmake/modules/CheckCxxFeatures.cmake
|
||||
@@ -7,19 +7,18 @@ set(CXX_FEATURES_UNSUPPORTED "")
|
||||
|
||||
macro(CXX_PERFORM_TEST TEST_SOURCE_FILE TEST_TEST_BINARY_DIR EXPECTED_RESULT RESULT COMPILE_DEFINITIONS)
|
||||
|
||||
- try_run(
|
||||
- RUN_RESULT_VAR COMPILE_RESULT_VAR
|
||||
+ try_compile(
|
||||
+ COMPILE_RESULT_VAR
|
||||
"${TEST_BINARY_DIR}" "${TEST_SOURCE_FILE}"
|
||||
COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS}"
|
||||
- COMPILE_OUTPUT_VARIABLE COMPILE_OUT
|
||||
- RUN_OUTPUT_VARIABLE RUN_OUT
|
||||
+ OUTPUT_VARIABLE COMPILE_OUT
|
||||
)
|
||||
|
||||
set(RESULT_VAR FALSE)
|
||||
|
||||
- if (COMPILE_RESULT_VAR AND NOT RUN_RESULT_VAR)
|
||||
+ if (COMPILE_RESULT_VAR)
|
||||
set(RESULT_VAR TRUE)
|
||||
- endif (COMPILE_RESULT_VAR AND NOT RUN_RESULT_VAR)
|
||||
+ endif (COMPILE_RESULT_VAR)
|
||||
|
||||
if (NOT ("${RESULT_VAR}" STREQUAL "${EXPECTED_RESULT}"))
|
||||
# message ("Got ${RESULT_VAR} as a result, but ${EXPECTED_RESULT} expected")
|
||||
@@ -29,12 +28,6 @@ macro(CXX_PERFORM_TEST TEST_SOURCE_FILE TEST_TEST_BINARY_DIR EXPECTED_RESULT RES
|
||||
# message("${COMPILE_OUT}")
|
||||
endif (NOT ${COMPILE_RESULT_VAR})
|
||||
|
||||
- if (${RUN_RESULT_VAR})
|
||||
- # message("---------- run output ----------")
|
||||
- # message("${RUN_OUT}")
|
||||
- # message("Process returned: ${RUN_RESULT_VAR}")
|
||||
- endif (${RUN_RESULT_VAR})
|
||||
-
|
||||
# message("--------------------------------")
|
||||
|
||||
set (${RESULT} FALSE)
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
SUMMARY = "System service to manage user's activities"
|
||||
LICENSE = "GPLv2 | GPLv3"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
"
|
||||
|
||||
inherit kde-plasma
|
||||
|
||||
DEPENDS += " \
|
||||
kdbusaddons \
|
||||
ki18n \
|
||||
kcoreaddons \
|
||||
kconfig \
|
||||
kxmlgui \
|
||||
kwindowsystem \
|
||||
kio \
|
||||
kservice \
|
||||
kglobalaccel \
|
||||
"
|
||||
|
||||
PV = "${PLASMA_VERSION}"
|
||||
SRC_URI[md5sum] = "116551aa32f5929648abf5e298385c83"
|
||||
SRC_URI[sha256sum] = "7e7d4bfbbe717bfa8892e69508f3113007251481a5becd8085585525e26c7dac"
|
||||
SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
${libdir}/libkactivitymanagerd_plugin.so \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \
|
||||
"
|
||||
Reference in New Issue
Block a user