From e7c37ed590cad02d4d2f0e86ce5fcb3f15c69fb8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Jun 2018 21:35:48 +0200 Subject: gnu: guile-ssh: Return #t from all phases. * gnu/packages/ssh.scm (guile-ssh)[arguments]: Substitute INVOKE for SYSTEM* and all its trappings. --- gnu/packages/ssh.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index dd8518002d..6a690c7dde 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -256,22 +256,22 @@ Additionally, various channel-specific options can be negotiated.") '(#:phases (modify-phases %standard-phases (add-after 'unpack 'autoreconf (lambda* (#:key inputs #:allow-other-keys) - (zero? (system* "autoreconf" "-vfi")))) + (invoke "autoreconf" "-vfi"))) (add-before 'build 'fix-libguile-ssh-file-name (lambda* (#:key outputs #:allow-other-keys) ;; Build and install libguile-ssh.so so that we can use ;; its absolute file name in .scm files, before we build ;; the .go files. - (and (zero? (system* "make" "install" - "-C" "libguile-ssh" - "-j" (number->string - (parallel-job-count)))) - (let* ((out (assoc-ref outputs "out")) - (libdir (string-append out "/lib"))) - (substitute* (find-files "." "\\.scm$") - (("\"libguile-ssh\"") - (string-append "\"" libdir "/libguile-ssh\""))) - #t)))) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (invoke "make" "install" + "-C" "libguile-ssh" + "-j" (number->string + (parallel-job-count))) + (substitute* (find-files "." "\\.scm$") + (("\"libguile-ssh\"") + (string-append "\"" lib "/libguile-ssh\""))) + #t))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1 From 7c1a64aa5c7d276cb1c34317f77535afec268b9e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Jun 2018 21:39:48 +0200 Subject: gnu: corkscrew: Return #t from all phases. * gnu/packages/ssl.scm (corkscrew)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/ssh.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 6a690c7dde..1240216ec7 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -345,9 +345,9 @@ libssh library.") ,(string-append "--build=" build) ,(string-append "--host=" (or target build))))) (setenv "CONFIG_SHELL" bash) - (zero? (apply system* bash - (string-append "." "/configure") - flags))))) + (apply invoke bash + (string-append "." "/configure") + flags)))) (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1 From d26563323d8559dcbb04621ccab02e07767abb6e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Jun 2018 21:45:30 +0200 Subject: gnu: corkscrew: Deduplicate documentation directories. * gnu/packages/ssh.scm (corkscrew)[arguments]: Install documentation to the correct versioned subdirectory, as already done by the build system. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 1240216ec7..caa8c783ea 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -331,7 +331,7 @@ libssh library.") (arguments ;; Replace configure phase as the ./configure script does not link ;; CONFIG_SHELL and SHELL passed as parameters - '(#:phases + `(#:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs inputs system build target @@ -351,7 +351,7 @@ libssh library.") (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/corkscrew"))) + (doc (string-append out "/share/doc/" ,name "-" ,version))) (install-file "README" doc) #t)))))) (home-page "http://www.agroman.net/corkscrew") -- cgit 1.4.1 From 5b34f56c1d645455137a16d94177a67358060fe4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Jun 2018 21:49:05 +0200 Subject: gnu: corkscrew: Clean up dead code. * gnu/packages/ssh.scm (corkscrew)[arguments]: Remove unnecessary variables and procedure calls. --- gnu/packages/ssh.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index caa8c783ea..cd92c62f58 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -329,25 +329,21 @@ libssh library.") "1gmhas4va6gd70i2x2mpxpwpgww6413mji29mg282jms3jscn3qd")))) (build-system gnu-build-system) (arguments - ;; Replace configure phase as the ./configure script does not link - ;; CONFIG_SHELL and SHELL passed as parameters `(#:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs inputs system build target - #:allow-other-keys #:rest args) - (let* ((configure (assoc-ref %standard-phases 'configure)) - (prefix (assoc-ref outputs "out")) - (bash (which "bash")) + ;; Replace configure phase as the ./configure script does not like + ;; CONFIG_SHELL and SHELL passed as parameters + (lambda* (#:key outputs build target #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash (which "bash")) ;; Set --build and --host flags as the provided config.guess ;; is not able to detect them - (flags `(,(string-append "--prefix=" prefix) + (flags `(,(string-append "--prefix=" out) ,(string-append "--build=" build) ,(string-append "--host=" (or target build))))) (setenv "CONFIG_SHELL" bash) - (apply invoke bash - (string-append "." "/configure") - flags)))) + (apply invoke bash "./configure" flags)))) (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1