ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: lsh: Fix build with GCC 10.

Browse source 
* gnu/packages/ssh.scm (lsh)[arguments]: Add "CFLAGS=-fcommon"
to #:configure-flags.  Don't explicitly return #t from phases.
[source]: Don't explicitly return #t from snippet.
This commit is contained in:
Tobias Geerinckx-Rice 2022-02-13 01:00:00 +01:00
parent 2b2f8c6b59
commit 1cdd6b09c8
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/ssh.scm
View file

@ -594,8 +594,7 @@ (define-public lsh
(("localhost") "127.0.0.1")) (("localhost") "127.0.0.1"))
(substitute* "src/testsuite/login-auth-test" (substitute* "src/testsuite/login-auth-test"
(("/bin/cat") "cat")) (("/bin/cat") "cat"))))
#t))
(patches (search-patches "lsh-fix-x11-forwarding.patch")))) (patches (search-patches "lsh-fix-x11-forwarding.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -629,7 +628,10 @@ (define-public lsh
;; 'lsh_argp.h' checks HAVE_ARGP_PARSE but nothing ;; 'lsh_argp.h' checks HAVE_ARGP_PARSE but nothing
;; defines it. ;; defines it.
"CPPFLAGS=-DHAVE_ARGP_PARSE") "CPPFLAGS=-DHAVE_ARGP_PARSE"
;; Fix the build of lsh@2.1 with GCC 10.
"CFLAGS=-fcommon")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
@ -642,8 +644,7 @@ (define-public lsh
(("seed-test \\\\") ;prevent trailing slash (("seed-test \\\\") ;prevent trailing slash
"seed-test") "seed-test")
(("^\t(lsh|daemon|tcpip|socks|lshg|lcp|rapid7|lshd).*test.*") (("^\t(lsh|daemon|tcpip|socks|lshg|lcp|rapid7|lshd).*test.*")
"")) ""))))
#t))
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((nettle (assoc-ref inputs "nettle")) (let* ((nettle (assoc-ref inputs "nettle"))