diff options
author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2017-09-30 11:00:32 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-09-30 22:41:12 +0200 |
commit | 839129b86453f0b0b2b47dac5502ecc3dae7ffb3 (patch) | |
tree | 390fb5c911ec87150081eacd08098a3a01ec5f4f /tools/cmake/patches/130-curl-fix-libressl-linking.patch | |
parent | 3adafda07c8509267e3321f4861f620ec3b2f37e (diff) | |
download | upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.gz upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.bz2 upstream-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.zip |
tools/cmake: Update to 3.9.3
Update CMake to 3.9.3
Remove FreeBSD patch (not needed)
Rearrage and update patches
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake/patches/130-curl-fix-libressl-linking.patch')
-rw-r--r-- | tools/cmake/patches/130-curl-fix-libressl-linking.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/tools/cmake/patches/130-curl-fix-libressl-linking.patch b/tools/cmake/patches/130-curl-fix-libressl-linking.patch new file mode 100644 index 0000000000..1a15ff47af --- /dev/null +++ b/tools/cmake/patches/130-curl-fix-libressl-linking.patch @@ -0,0 +1,33 @@ +From: Jo-Philipp Wich <jo@mein.io> +Date: Wed, 11 Jan 2017 03:36:04 +0100 +Subject: [PATCH] cmcurl: link librt + +When cmake is linked against LibreSSL, there might be an indirect +dependency on librt on certain systems if LibreSSL's libcrypto uses +clock_gettime() from librt: + + [ 28%] Linking C executable LIBCURL + .../lib/libcrypto.a(getentropy_linux.o): In function `getentropy_fallback': + getentropy_linux.c:(.text+0x16d): undefined reference to `clock_gettime' + getentropy_linux.c:(.text+0x412): undefined reference to `clock_gettime' + collect2: error: ld returned 1 exit status + make[5]: *** [Utilities/cmcurl/LIBCURL] Error 1 + +Modify the cmcurl CMakeLists.txt to check for clock_gettime() in librt +and unconditionally link the rt library when the symbol is found. + +Signed-off-by: Jo-Philipp Wich <jo@mein.io> +--- +--- a/Utilities/cmcurl/CMakeLists.txt ++++ b/Utilities/cmcurl/CMakeLists.txt +@@ -471,6 +471,10 @@ if(CMAKE_USE_OPENSSL) + check_symbol_exists(RAND_status "${CURL_INCLUDES}" HAVE_RAND_STATUS) + check_symbol_exists(RAND_screen "${CURL_INCLUDES}" HAVE_RAND_SCREEN) + check_symbol_exists(RAND_egd "${CURL_INCLUDES}" HAVE_RAND_EGD) ++ check_library_exists("rt" clock_gettime "" HAVE_LIBRT) ++ if(HAVE_LIBRT) ++ list(APPEND OPENSSL_LIBRARIES rt) ++ endif() + + # Optionally build with a specific CA cert bundle. + if(CURL_CA_BUNDLE) |