me/guix
Archived
1
0
Fork 0
Code Activity

gnu: libssh2: Fix build on MIPS systems.

Browse source 
* gnu/packages/ssh.scm (libssh2)[arguments]: When building for MIPS, replace
the existing bootstrap phase instead of adding a new 'autoreconf' phase (in
the wrong place).
This commit is contained in:
Mark H Weaver 2018-05-28 03:29:56 -04:00
parent 073cc31313
commit fe365a3d0e
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/ssh.scm
View file

@ -116,11 +116,24 @@ remote applications.")
;; zlib libraries, so we need to propagate the inputs. ;; zlib libraries, so we need to propagate the inputs.
(propagated-inputs `(("libgcrypt" ,libgcrypt) (propagated-inputs `(("libgcrypt" ,libgcrypt)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments '(#:configure-flags `("--with-libgcrypt") (arguments `(#:configure-flags `("--with-libgcrypt")
#:phases (modify-phases %standard-phases #:phases
(add-before 'configure 'autoreconf ;; FIXME: In the next core-updates cycle, replace the entire
(lambda _ ;; following ,(...) form with its first 'modify-phases'
(invoke "autoreconf" "-v")))))) ;; subform. The change made here is only strictly needed on
;; MIPS, but should work on any system. For now, we apply it
;; only to MIPS to avoid forcing thousands of rebuilds on
;; other systems.
,(if (string-prefix? "mips" (or (%current-target-system)
(%current-system)))
'(modify-phases %standard-phases
(replace 'bootstrap
(lambda _
(invoke "autoreconf" "-v"))))
'(modify-phases %standard-phases
(add-before 'configure 'autoreconf
(lambda _
(invoke "autoreconf" "-v")))))))
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake))) ("automake" ,automake)))
(synopsis "Client-side C library implementing the SSH2 protocol") (synopsis "Client-side C library implementing the SSH2 protocol")