commit: 87978771148cc4f229aee49823f32a26e8ca7f6f
Author: PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Apr 13 12:40:15 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 12:50:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87978771
dev-util/cmocka: fix detection of librt.so in non-native ABIs
Gentoo-bug: 562580
Thanks to eroen <gentoo <AT> eroen.eu> for reporting and to Coacher
<itumaykin+gentoo <AT> gmail.com> for locating the upstream commit.
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
dev-util/cmocka/cmocka-1.0.1.ebuild | 2 +
.../cmocka-1.0.1-fix-librt-configure-issue.patch | 56 ++++++++++++++++++++++
2 files changed, 58 insertions(+)
diff --git a/dev-util/cmocka/cmocka-1.0.1.ebuild
b/dev-util/cmocka/cmocka-1.0.1.ebuild
index f617b52..8f2ac11 100644
--- a/dev-util/cmocka/cmocka-1.0.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.0.1.ebuild
@@ -20,6 +20,8 @@ DEPEND="
"
RDEPEND=""
+PATCHES=( "${FILESDIR}/${P}-fix-librt-configure-issue.patch" )
+
DOCS=( AUTHORS ChangeLog README )
multilib_src_configure() {
diff --git a/dev-util/cmocka/files/cmocka-1.0.1-fix-librt-configure-issue.patch
b/dev-util/cmocka/files/cmocka-1.0.1-fix-librt-configure-issue.patch
new file mode 100644
index 0000000..2bafd90
--- /dev/null
+++ b/dev-util/cmocka/files/cmocka-1.0.1-fix-librt-configure-issue.patch
@@ -0,0 +1,56 @@
+From b2732b52202ae48f866a024c633466efdbb8e85a Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <[email protected]>
+Date: Thu, 3 Mar 2016 09:12:21 +0100
+Subject: cmake: Fix possible issues with librt during configure
+
+Signed-off-by: Andreas Schneider <[email protected]>
+---
+ ConfigureChecks.cmake | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
+index c2064dd..31c5a94 100644
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
+@@ -100,11 +100,9 @@ else (WIN32)
+ endif (WIN32)
+
+ find_library(RT_LIBRARY rt)
+-if (RT_LIBRARY)
+- set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
+-endif (RT_LIBRARY)
+-
+-set(CMOCKA_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL
"cmocka required system libraries")
++if (RT_LIBRARY AND NOT LINUX)
++ set(CMOCKA_REQUIRED_LIBRARIES ${RT_LIBRARY} CACHE INTERNAL "cmocka
required system libraries")
++endif ()
+
+ # OPTIONS
+ check_c_source_compiles("
+@@ -124,9 +122,10 @@ int main(void) {
+ endif(WIN32)
+
+ if (HAVE_TIME_H AND HAVE_STRUCT_TIMESPEC AND HAVE_CLOCK_GETTIME)
+- set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
++ if (RT_LIBRARY)
++ set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
++ endif()
+
+- message(STATUS "CMAKE_REQUIRED_INCLUDES=${CMAKE_REQUIRED_INCLUDES}
CMAKE_REQUIRED_LIBRARIES=${CMAKE_REQUIRED_LIBRARIES}")
+ check_c_source_compiles("
+ #include <time.h>
+
+@@ -137,7 +136,10 @@ int main(void) {
+
+ return 0;
+ }" HAVE_CLOCK_GETTIME_REALTIME)
++
++ # reset cmake requirements
+ set(CMAKE_REQUIRED_INCLUDES)
++ set(CMAKE_REQUIRED_LIBRARIES)
+ endif ()
+
+ # ENDIAN
+--
+cgit v0.12
+
