Re: libssh-mirror | keygen2 requires also ${ARGP_LIBRARY} (!224)

[Carlo Bramini <carlo.bramix@xxxxxxxxx>]

Hello,
I'm re-sending this message, as requested from:
https://gitlab.com/libssh/libssh-mirror/-/merge_requests/224#note_972249588
Thank you very much.

Sincerely,
Carlo Bramini.

> Il 31/05/2022 17:32 Carlo Bramini <carlo.bramix@xxxxxxxxx> ha scritto:
> 

Hello, I'm sending to you the edited commit with signoff comment.
Thank you very much for the help!

Sincerely,

Carlo Bramini.


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


> > Il 25/05/2022 13:55 Jakub Jelen (@jjelen) <gitlab@xxxxxxxxxxxxx> ha scritto:
> > 
> > 
> >  
> > Jakub Jelen (https://gitlab.com/jjelen) commented (https://gitlab.com/libssh/libssh-mirror/-/merge_requests/224#note_959602212):
> > @carlo-bramini (https://gitlab.com/carlo-bramini) I tried to reach out to you through the mailing list with the updated patches, with the sign-off, but I am not sure if you are subscribed or if your mailing address @users.sourceforge, which is in the commits here works. If so, can you reply in there (or message me with email you use), so the attribution for the contribution can reach out to you?
> > https://archive.libssh.org/libssh/2022-05/0000004.html
> > Thanks.
> > — 
> >  Reply to this email directly or view it on GitLab (https://gitlab.com/libssh/libssh-mirror/-/merge_requests/224#note_959602212). 
> >  You're receiving this email because you have been mentioned on gitlab.com. If you'd like to receive fewer emails, you can unsubscribe (https://gitlab.com/-/sent_notifications/cd617a76f00cd64efe4f1b47c212f527/unsubscribe) from this thread or adjust your notification settings.