From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manolis Ragkousis Subject: [PATCH] gnu: hurd: Remove inputs no longer needed and move configure flags. Date: Tue, 7 Jun 2016 15:00:44 +0300 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------8CCBC5CCC5B0796AD8A0A477" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAFgn-0000lD-1y for guix-devel@gnu.org; Tue, 07 Jun 2016 08:01:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAFgl-0007Sf-Nl for guix-devel@gnu.org; Tue, 07 Jun 2016 08:00:57 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------8CCBC5CCC5B0796AD8A0A477 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Hello, This is another patch from wip-hurd modified for core-updates. Thank you, Manolis --------------8CCBC5CCC5B0796AD8A0A477 Content-Type: text/x-patch; name="0001-gnu-hurd-Remove-inputs-no-longer-needed-and-move-con.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-gnu-hurd-Remove-inputs-no-longer-needed-and-move-con.pa"; filename*1="tch" >From 984de2d0e26b1ddd860d0468453ee8679ced756d Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Tue, 7 Jun 2016 14:45:55 +0300 Subject: [PATCH] gnu: hurd: Remove inputs no longer needed and move configure flags. * gnu/packages/hurd.scm (hurd-minimal)[arguments]: Move configure-flags from here.. (hurd-headers)[arguments]: ..to here. (hurd-headers, hurd-minimal)[native-inputs]: Remove "autoconf". --- gnu/packages/hurd.scm | 82 ++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 47 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 2b2e162..72e4061 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -21,12 +21,12 @@ #:use-module (guix download) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages flex) #:use-module (gnu packages bison) #:use-module (gnu packages perl) - #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (guix git-download)) @@ -108,11 +108,7 @@ communication.") "1pbc4aqgzxvkgivw80ghp3w755cl0fwxmg357vq7chimj64jk78d")))) (build-system gnu-build-system) (native-inputs - `(;; Autoconf shouldn't be necessary but there seems to be a bug in the - ;; build system triggering its use. - ("autoconf" ,autoconf) - - ("mig" ,mig))) + `(("mig" ,mig))) (arguments `(#:phases (alist-replace 'install @@ -122,10 +118,20 @@ communication.") #:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants ;; that. - "--build=i686-pc-gnu" + ,@(if (%current-target-system) + '() + '("--host=i586-pc-gnu")) ;; Reduce set of dependencies. - "--without-parted") + "--without-parted" + "--disable-ncursesw" + "--disable-test" + "--without-libbz2" + "--without-libz" + "--without-parted" + ;; Skip the clnt_create check because it expects + ;; a working glibc causing a circular dependency. + "ac_cv_search_clnt_create=no") #:tests? #f)) (home-page "http://www.gnu.org/software/hurd/hurd.html") @@ -140,46 +146,28 @@ Library and other user programs.") (name "hurd-minimal") (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers))) (native-inputs - `(("autoconf" ,(autoconf-wrapper)) - ("mig" ,mig))) - + `(("mig" ,mig))) (arguments - `(#:phases (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; We need to copy libihash.a to the output directory manually, - ;; since there is no target for that in the makefile. - (mkdir-p (string-append out "/include")) - (copy-file "libihash/ihash.h" - (string-append out "/include/ihash.h")) - (mkdir-p (string-append out "/lib")) - (copy-file "libihash/libihash.a" - (string-append out "/lib/libihash.a")) - #t)) - (alist-replace - 'build - (lambda _ - (zero? (system* "make" "-Clibihash" "libihash.a"))) - (alist-cons-before - 'configure 'bootstrap - (lambda _ - (zero? (system* "autoreconf" "-vfi"))) - %standard-phases))) - #:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants - ;; that. - "--host=i686-pc-gnu" - - ;; Reduce set of dependencies. - "--disable-ncursesw" - "--disable-test" - "--without-libbz2" - "--without-libz" - "--without-parted" - ;; Skip the clnt_create check because it expects - ;; a working glibc causing a circular dependency. - "ac_cv_search_clnt_create=no") - #:tests? #f)) + (substitute-keyword-arguments (package-arguments hurd-headers) + ((#:phases _) + '(alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; We need to copy libihash.a to the output directory manually, + ;; since there is no target for that in the makefile. + (mkdir-p (string-append out "/include")) + (copy-file "libihash/ihash.h" + (string-append out "/include/ihash.h")) + (mkdir-p (string-append out "/lib")) + (copy-file "libihash/libihash.a" + (string-append out "/lib/libihash.a")) + #t)) + (alist-replace + 'build + (lambda _ + (zero? (system* "make" "-Clibihash" "libihash.a"))) + %standard-phases))))) (home-page "http://www.gnu.org/software/hurd/hurd.html") (synopsis "GNU Hurd libraries") (description -- 2.8.2 --------------8CCBC5CCC5B0796AD8A0A477--