summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2019-09-18 19:35:08 +0000
committernia <nia@pkgsrc.org>2019-09-18 19:35:08 +0000
commit223ce4dc9ca4eadf34300472767f8ee2ee4d0b54 (patch)
tree15787c065024346bdb9f472cb480a9e8cd6eada3
parenta6c2c62a677f0927fe462ce38af9b9ca68d4a93d (diff)
downloadpkgsrc-223ce4dc9ca4eadf34300472767f8ee2ee4d0b54.tar.gz
libssh: update patch
-rw-r--r--security/libssh/patches/patch-CompilerChecks.cmake19
1 files changed, 14 insertions, 5 deletions
diff --git a/security/libssh/patches/patch-CompilerChecks.cmake b/security/libssh/patches/patch-CompilerChecks.cmake
index e138d44385a..f6bdbf0786d 100644
--- a/security/libssh/patches/patch-CompilerChecks.cmake
+++ b/security/libssh/patches/patch-CompilerChecks.cmake
@@ -1,27 +1,36 @@
-$NetBSD: patch-CompilerChecks.cmake,v 1.1 2018/12/03 15:19:51 adam Exp $
+$NetBSD: patch-CompilerChecks.cmake,v 1.2 2019/09/18 19:35:08 nia Exp $
Let PkgSrc handle security features.
---- CompilerChecks.cmake.orig 2018-12-03 09:27:44.000000000 +0000
+--- CompilerChecks.cmake.orig 2019-06-27 08:34:16.000000000 +0000
+++ CompilerChecks.cmake
-@@ -62,20 +62,7 @@ if (UNIX)
+@@ -66,29 +66,6 @@ if (UNIX)
endif()
endif()
- check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG)
- if (WITH_STACK_PROTECTOR_STRONG)
- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong")
+- # This is needed as Solaris has a seperate libssp
+- if (SOLARIS)
+- list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong")
+- endif()
- else (WITH_STACK_PROTECTOR_STRONG)
- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
- if (WITH_STACK_PROTECTOR)
- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
+- # This is needed as Solaris has a seperate libssp
+- if (SOLARIS)
+- list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector")
+- endif()
- endif()
- endif (WITH_STACK_PROTECTOR_STRONG)
-
+-
- check_c_compiler_flag_ssp("-fstack-clash-protection" WITH_STACK_CLASH_PROTECTION)
- if (WITH_STACK_CLASH_PROTECTION)
- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-clash-protection")
- endif()
-
+-
if (PICKY_DEVELOPER)
add_c_compiler_flag("-Wno-error=deprecated-declarations" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wno-error=tautological-compare" SUPPORTED_COMPILER_FLAGS)