summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-06-09 16:17:34 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-06-17 06:48:04 +0000
commit9d90bbd7b14db17a64e6a664e6f98b58efa97747 (patch)
tree0db36edc3a708e2cd0d43660c93054f264f34106 /src
parent72d4f0750baae1bb296341bde166f020d29c7faa (diff)
rework detection and use of clock_gettime()/librt
recent versions of glibc include clock_gettime() inside libc itself. Task-number: QTBUG-41009 Change-Id: I7401773be99682a356bf06a69571d11c4b15978b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/configure.json18
-rw-r--r--src/corelib/kernel/kernel.pri2
2 files changed, 12 insertions, 8 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index c6c5c93ddb..deb7a544ef 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -84,6 +84,14 @@
"-ldl"
]
},
+ "librt": {
+ "label": "clock_gettime()",
+ "test": "unix/clock-gettime",
+ "sources": [
+ "",
+ "-lrt"
+ ]
+ },
"pcre2": {
"label": "PCRE2",
"test": "unix/pcre2",
@@ -119,15 +127,11 @@
"type": "compile",
"test": "common/atomicfptr"
},
- "clock-gettime": {
- "label": "clock_gettime()",
- "type": "compile",
- "test": "unix/clock-gettime"
- },
"clock-monotonic": {
"label": "POSIX monotonic clock",
"type": "compile",
- "test": "unix/clock-monotonic"
+ "test": "unix/clock-monotonic",
+ "use": "librt"
},
"cloexec": {
"label": "O_CLOEXEC",
@@ -199,7 +203,7 @@
"features": {
"clock-gettime": {
"label": "clock_gettime()",
- "condition": "tests.clock-gettime",
+ "condition": "config.unix && libs.librt",
"output": [ "privateFeature" ]
},
"clock-monotonic": {
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 0e6ff17b8f..29bd5bbc6c 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -162,7 +162,7 @@ unix|integrity {
QMAKE_USE_PRIVATE += glib
}
- qtConfig(clock-gettime): include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
+ qtConfig(clock-gettime): QMAKE_USE_PRIVATE += librt
!android {
SOURCES += kernel/qsharedmemory_posix.cpp \