Libssh merge requests regarding compiler options

[Jakub Jelen <jjelen@xxxxxxxxxx>]

Hi Carlo,
I am writing to you regarding your merge requests, which are missing 
your sign-off:

https://gitlab.com/libssh/libssh-mirror/-/merge_requests/223
https://gitlab.com/libssh/libssh-mirror/-/merge_requests/224

I attached the commits with correct signoff to merge them into libssh, 
but I need you "sign-off" at least as a reply to this email on the 
libssh mailing list so I can merge them.

Regards,
--
Jakub Jelen
Crypto Team, Security Engineering
Red Hat, Inc.

From 3ea42d42d70ce3bbe3e3b195e2874a232de15574 Mon Sep 17 00:00:00 2001
From: Carlo Bramini <carlo_bramini@xxxxxxxxxxxxxxxxxxxxx>
Date: Sat, 5 Feb 2022 13:45:29 +0000
Subject: [PATCH 1/2] keygen2 requires also ${ARGP_LIBRARY}

Signed-off-by: Carlo Bramini <carlo_bramini@xxxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Jakub Jelen <jjelen@xxxxxxxxxx>
---
 examples/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c688b6a3..466865f7 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -66,7 +66,7 @@ if (UNIX AND NOT WIN32)
 
         add_executable(keygen2 keygen2.c ${examples_SRCS})
         target_compile_options(keygen2 PRIVATE ${DEFAULT_C_COMPILE_FLAGS})
-        target_link_libraries(keygen2 ssh::ssh)
+        target_link_libraries(keygen2 ssh::ssh ${ARGP_LIBRARY})
 
     endif()
 endif (UNIX AND NOT WIN32)
-- 
2.34.3


From 69eb57519fd0b637b9940ba395ff68c16a1e7096 Mon Sep 17 00:00:00 2001
From: Carlo Bramini <carlo_bramini@xxxxxxxxxxxxxxxxxxxxx>
Date: Sat, 5 Feb 2022 13:05:40 +0000
Subject: [PATCH 2/2] Don't set "-fstack-clash-protection" option on Windows

Signed-off-by: Carlo Bramini <carlo_bramini@xxxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Jakub Jelen <jjelen@xxxxxxxxxx>
---
 CompilerChecks.cmake | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake
index 5bdc05c3..9acae281 100644
--- a/CompilerChecks.cmake
+++ b/CompilerChecks.cmake
@@ -85,9 +85,11 @@ if (UNIX)
         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")
+    if (NOT WINDOWS AND NOT CYGWIN)
+        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()
     endif()
 
     if (PICKY_DEVELOPER)
-- 
2.34.3