CVS commit: pkgsrc/security/libssh/patches

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Sep 18 19:35:08 UTC 2019

Modified Files:
        pkgsrc/security/libssh/patches: patch-CompilerChecks.cmake

Log Message:
libssh: update patch


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake
diff -u pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake:1.1 pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake:1.2
--- pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake:1.1       Mon Dec  3 15:19:51 2018
+++ pkgsrc/security/libssh/patches/patch-CompilerChecks.cmake   Wed Sep 18 19:35:08 2019
@@ -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)