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/140-curl-fix-libressl-linking.patch | |
| parent | 3adafda07c8509267e3321f4861f620ec3b2f37e (diff) | |
| download | mtk-20170518-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.zip mtk-20170518-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.gz mtk-20170518-839129b86453f0b0b2b47dac5502ecc3dae7ffb3.tar.bz2 | |
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/140-curl-fix-libressl-linking.patch')
| -rw-r--r-- | tools/cmake/patches/140-curl-fix-libressl-linking.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/tools/cmake/patches/140-curl-fix-libressl-linking.patch b/tools/cmake/patches/140-curl-fix-libressl-linking.patch deleted file mode 100644 index c16e927..0000000 --- a/tools/cmake/patches/140-curl-fix-libressl-linking.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 -@@ -374,6 +374,10 @@ set(HAVE_LIBSSL OFF) - if(CMAKE_USE_OPENSSL) - find_package(OpenSSL) - if(OPENSSL_FOUND) -+ check_library_exists("rt" clock_gettime "" HAVE_LIBRT) -+ if(HAVE_LIBRT) -+ list(APPEND OPENSSL_LIBRARIES rt) -+ endif() - list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) - set(USE_OPENSSL ON) - set(HAVE_LIBCRYPTO ON) |