aboutsummaryrefslogtreecommitdiffstats
path: root/tools/cmake/patches/120-curl-fix-libressl-linking.patch
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2019-03-16 21:09:22 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2019-09-01 18:38:05 +0200
commit413c68d120043cd8ff1f4aa057d33c140bfc6bfa (patch)
tree83890d5a974042f8f2d5f3cb6d1d36c753bcf78f /tools/cmake/patches/120-curl-fix-libressl-linking.patch
parentb74f1f335a792a15feb0fd839a69486050d3531f (diff)
downloadupstream-413c68d120043cd8ff1f4aa057d33c140bfc6bfa.tar.gz
upstream-413c68d120043cd8ff1f4aa057d33c140bfc6bfa.tar.bz2
upstream-413c68d120043cd8ff1f4aa057d33c140bfc6bfa.zip
tools/cmake: Update to 3.15.1
Update CMake to 3.15.1 Refresh patches Remove inofficial fossies.org and replace with GitHub (link on official site) Remove 150-C-feature-checks-Match-warnings-more-strictly.patch as it's a no longer needed backport from upstream. Disable ccache if GCC is 4.8, 4.9 or 5.X to avoid build failures. Reference: https://github.com/openwrt/openwrt/pull/1929 Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake/patches/120-curl-fix-libressl-linking.patch')
-rw-r--r--tools/cmake/patches/120-curl-fix-libressl-linking.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/cmake/patches/120-curl-fix-libressl-linking.patch b/tools/cmake/patches/120-curl-fix-libressl-linking.patch
index e217979ee4..e7d9c5ddda 100644
--- a/tools/cmake/patches/120-curl-fix-libressl-linking.patch
+++ b/tools/cmake/patches/120-curl-fix-libressl-linking.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
-@@ -454,6 +454,14 @@ if(CMAKE_USE_OPENSSL)
+@@ -453,6 +453,14 @@ if(CMAKE_USE_OPENSSL)
set(USE_OPENSSL ON)
set(HAVE_LIBCRYPTO ON)
set(HAVE_LIBSSL ON)