chiark - git - mdw - termux-packages/blob - packages/libmosquitto/detect-librt-and-pthread.patch

   1 Submitted for upstream inclusion at:
   2 https://github.com/eclipse/mosquitto/pull/360
   3
   4 diff -u -r ../mosquitto-1.4.10/src/CMakeLists.txt ./src/CMakeLists.txt
   5 --- ../mosquitto-1.4.10/src/CMakeLists.txt      2016-08-17 13:05:14.000000000 +0200
   6 +++ ./src/CMakeLists.txt        2017-01-24 22:30:42.611308509 +0100
   7 @@ -86,7 +86,11 @@
   8         if (APPLE)
   9                 set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
  10         else (APPLE)
  11 -               set (MOSQ_LIBS ${MOSQ_LIBS} rt dl m)
  12 +               set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
  13 +               find_library(LIBRT rt)
  14 +               if (LIBRT)
  15 +                       set (MOSQ_LIBS ${MOSQ_LIBS} rt)
  16 +               endif (LIBRT)
  17         endif (APPLE)
  18  endif (UNIX)
  19
  20 diff -u -r ../mosquitto-1.4.10/lib/CMakeLists.txt ./lib/CMakeLists.txt
  21 --- ../mosquitto-1.4.10/lib/CMakeLists.txt      2016-08-17 13:05:14.000000000 +0200
  22 +++ ./lib/CMakeLists.txt        2017-01-15 21:09:21.548573341 +0100
  23 @@ -7,7 +7,12 @@
  24                 set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
  25                 set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
  26         else (WIN32)
  27 -               set (PTHREAD_LIBRARIES pthread)
  28 +               find_library(LIBPTHREAD pthread)
  29 +               if (LIBPTHREAD)
  30 +                       set (PTHREAD_LIBRARIES pthread)
  31 +               else (LIBPTHREAD)
  32 +                       set (PTHREAD_LIBRARIES "")
  33 +               endif()
  34                 set (PTHREAD_INCLUDE_DIR "")
  35         endif (WIN32)
  36  else (${WITH_THREADING} STREQUAL ON)
  37 @@ -44,7 +49,10 @@
  38  set (LIBRARIES ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES})
  39
  40  if (UNIX AND NOT APPLE)
  41 -       set (LIBRARIES ${LIBRARIES} rt)
  42 +       find_library(LIBRT rt)
  43 +       if (LIBRT)
  44 +               set (LIBRARIES ${LIBRARIES} rt)
  45 +       endif (LIBRT)
  46  endif (UNIX AND NOT APPLE)
  47
  48  if (WIN32)