Attachment 116101 Details for Bug 90687 – No need to link against librt on QNX

[patch] No need to link against librt on QNX

0001-QNX-do-not-link-against-librt.patch (text/plain), 1.34 KB, created by Rafael Roquetto on 2015-05-27 21:43:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafael Roquetto

Created: 2015-05-27 21:43:18 UTC

Size: 1.34 KB

patch

obsolete

>From 5c31574486979b2df3e6eafbd54e9bcf7497cc6b Mon Sep 17 00:00:00 2001
>From: Rafael Roquetto <rafael.roquetto@kdab.com>
>Date: Wed, 27 May 2015 15:01:39 -0300
>Subject: [PATCH 1/2] QNX: do not link against librt.
>
>The functionality exported by this library is provided by the standard libc on
>QNX.
>---
> cmake/dbus/CMakeLists.txt | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
>index 1701408..482966b 100644
>--- a/cmake/dbus/CMakeLists.txt
>+++ b/cmake/dbus/CMakeLists.txt
>@@ -281,7 +281,10 @@ else(WIN32)
>     if(DEFINED DBUS_LIBRARY_REVISION)
>         set_target_properties(dbus-1 PROPERTIES VERSION ${DBUS_LIBRARY_MAJOR}.${DBUS_LIBRARY_AGE}.${DBUS_LIBRARY_REVISION} SOVERSION ${DBUS_LIBRARY_MAJOR})
>     endif()
>-    target_link_libraries(dbus-1 ${CMAKE_THREAD_LIBS_INIT} rt)
>+
>+    if (NOT CMAKE_SYSTEM_NAME STREQUAL "QNX")
>+        target_link_libraries(dbus-1 ${CMAKE_THREAD_LIBS_INIT} rt)
>+    endif()
> endif(WIN32)
> 
> # Assume that Linux has -Wl,--version-script and other platforms do not
>@@ -307,7 +310,7 @@ if(WIN32)
>     else(WINCE)
>         target_link_libraries(dbus-internal ws2_32 advapi32 netapi32 iphlpapi)
>     endif(WINCE)
>-else(WIN32)
>+elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "QNX")
>     target_link_libraries(dbus-internal ${CMAKE_THREAD_LIBS_INIT} rt)
> endif(WIN32)
> 
>-- 
>2.4.1
>

Actions: View | Splinter Review

Attachments on bug 90687: 116101 | 116102 | 116103 | 116434

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.