From 56c092ce94cee893898f71ce61e443dd121cccdb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Jun 2013 00:25:54 +0200 Subject: build-system/gnu: Unify with (guix build-system gnu-cross-build). * guix/build/gnu-build-system.scm (set-paths): Add `native-inputs' and `native-search-paths' keyword parameters. Honor them. (configure): Add `target' and `native-inputs' keyword parameters. Look for Bash in NATIVE-INPUTS or INPUTS. Pass `--host' when TARGET is true. (strip): Add `strip-command' keyword parameter. Use it. * guix/build/gnu-cross-build.scm: Remove. * Makefile.am (MODULES): Adjust accordingly. * gnu/packages/acl.scm, gnu/packages/attr.scm, gnu/packages/base.scm, gnu/packages/bash.scm, gnu/packages/gawk.scm, gnu/packages/gettext.scm, gnu/packages/guile.scm, gnu/packages/libffi.scm, gnu/packages/libsigsegv.scm, gnu/packages/linux.scm, gnu/packages/ncurses.scm, gnu/packages/readline.scm, guix/build-system/gnu.scm: Replace `%standard-cross-phases' by `%standard-phases'. Remove references to (guix build gnu-cross-build). --- gnu/packages/libffi.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/packages/libffi.scm') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index f7d4a8c908..fdebab7433 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -49,15 +49,10 @@ "0ln4jbpb6clcsdpb9niqk0frgx4k0xki96wiv067ig0q4cajb7aq")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) (guix build gnu-build-system) - (ice-9 ftw) (srfi srfi-26) - ,@(if (%current-target-system) - '((guix build gnu-cross-build)) - '())) + (ice-9 ftw) (srfi srfi-26)) #:phases (alist-cons-after 'install 'post-install ,post-install-phase - ,(if (%current-target-system) - '%standard-cross-phases - '%standard-phases)))) + %standard-phases))) (synopsis "Foreign function call interface library") (description "The libffi library provides a portable, high level programming interface -- cgit v1.2.3 From a62b83d52fb154e6d1073ab3620daa48e101f933 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 22 Jun 2013 16:47:09 +0200 Subject: gnu: libffi: Upgrade to 3.0.13. * gnu/packages/libffi.scm (libffi): Upgrade to 3.0.13. --- gnu/packages/libffi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/libffi.scm') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index fdebab7433..0707bf8a7e 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -29,7 +29,7 @@ (define out (assoc-ref outputs "out")) (mkdir (string-append out "/include")) (with-directory-excursion - (string-append out "/lib/libffi-3.0.9/include") + (string-append out "/lib/libffi-3.0.13/include") (for-each (lambda (h) (format #t "moving `~a' to includedir~%" h) (rename-file h (string-append out "/include/" h))) @@ -38,7 +38,7 @@ (not (member x '("." "..")))))))))) (package (name "libffi") - (version "3.0.9") + (version "3.0.13") (source (origin (method url-fetch) (uri @@ -46,7 +46,7 @@ name "-" version ".tar.gz")) (sha256 (base32 - "0ln4jbpb6clcsdpb9niqk0frgx4k0xki96wiv067ig0q4cajb7aq")))) + "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) (guix build gnu-build-system) (ice-9 ftw) (srfi srfi-26)) -- cgit v1.2.3 From 9bf62d9b1d8058b7c428932d40ac91dd48e988dc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Jul 2013 23:55:04 +0200 Subject: gnu: Add a "debug" output for some packages. * gnu/packages/base.scm (coreutils, gnu-make, glibc): Add a "debug" output. * gnu/packages/bdw-gc.scm (libgc): Likewise. * gnu/packages/guile.scm (guile-2.0): Likewise. * gnu/packages/libffi.scm (libffi): Likewise. * gnu/packages/multiprecision.scm (gmp, mpfr, mpc): Likewise. --- gnu/packages/base.scm | 4 +++- gnu/packages/bdw-gc.scm | 1 + gnu/packages/guile.scm | 2 ++ gnu/packages/libffi.scm | 1 + gnu/packages/multiprecision.scm | 3 +++ 5 files changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/libffi.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 95052775c5..7ca7ec74c6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -279,6 +279,7 @@ The tools supplied with this package are: ,@(if (%current-target-system) '() `(("perl" ,perl))))) + (outputs '("out" "debug")) (arguments `(#:parallel-build? #f ; help2man may be called too early #:phases (alist-cons-before @@ -316,6 +317,7 @@ are expected to exist on every operating system.") (build-system gnu-build-system) (native-inputs `(("patch/impure-dirs" ,(search-patch "make-impure-dirs.patch")))) + (outputs '("out" "debug")) (arguments '(#:patches (list (assoc-ref %build-inputs "patch/impure-dirs")) #:phases (alist-cons-before @@ -403,7 +405,7 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") ;; reference to them anyway, so there's no space savings here. ;; TODO: Eventually we may want to add a $LOCALE_ARCHIVE search path like ;; Nixpkgs does. - (outputs '("out" "locales")) + (outputs '("out" "locales" "debug")) (arguments `(#:out-of-source? #t diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index bebb0862e3..7cce9671d1 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -39,6 +39,7 @@ ;; Make it so that we don't rely on /proc. This is especially useful in ;; an initrd run before /proc is mounted. '(#:configure-flags '("CPPFLAGS=-DUSE_LIBC_PRIVATES"))) + (outputs '("out" "debug")) (synopsis "The Boehm-Demers-Weiser conservative garbage collector for C and C++") (description diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c78ab57915..772776349e 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -138,6 +138,8 @@ extensible. It supports many SRFIs.") (self-native-input? #t) + (outputs '("out" "debug")) + (arguments `(#:phases (alist-cons-before 'configure 'pre-configure diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 0707bf8a7e..e4a2761273 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -53,6 +53,7 @@ #:phases (alist-cons-after 'install 'post-install ,post-install-phase %standard-phases))) + (outputs '("out" "debug")) (synopsis "Foreign function call interface library") (description "The libffi library provides a portable, high level programming interface diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 46acba3065..16383d1ec1 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -38,6 +38,7 @@ "1hnbxz7a6jrli8ph27i8zb6k2f456zn6l5xi78yhskzbxjk47nf7")))) (build-system gnu-build-system) (native-inputs `(("m4" ,m4))) + (outputs '("out" "debug")) (arguments `(#:configure-flags '(;; Build a "fat binary", with routines for several ;; sub-architectures. @@ -78,6 +79,7 @@ faster algorithms.") (sha256 (base32 "0fs501qi8l523gs3cpy4jjcnvwxggyfbklcys80wq236xx3hz79r")))) (build-system gnu-build-system) + (outputs '("out" "debug")) (propagated-inputs `(("gmp" ,gmp))) ; refers to (synopsis "C library for arbitrary precision floating-point arithmetic") (description @@ -103,6 +105,7 @@ double-precision floating-point arithmetic (53-bit mantissa).") (sha256 (base32 "1zq0fidp1jii2j5k5n9hmx55a6wwid33gjzhimvxq9d5zrf82npd")))) (build-system gnu-build-system) + (outputs '("out" "debug")) (propagated-inputs `(("gmp" ,gmp) ; refers to both ("mpfr" ,mpfr))) (synopsis "C library for arbitrary precision complex arithmetic") -- cgit v1.2.3