@ build-succeeded /nix/store/swa7j95kvdp8gi49b59llckmkb73z5b9-hello-2.8.drv /nix/store/3nlfldhm3ckl319jhnb1rdwgi0c7kf38-hello-2.8 /nix/store/3nlfldhm3ckl319jhnb1rdwgi0c7kf38-hello-2.8
I'm attaching three patches. '0001-gnu-Disable-Libtool-s-testsuite.patch' and '0001-gnu-Set-ARCH-to-mips.patch' are for 'mips64el'. The other one is for 'core-updates', but it's also needed for 'mips64el'. (Should I push to both?) Could you test them? (Don't forget to adjust 'build-aux/download.scm'.) I'll push them if they are fine.
From 41aeaf76e8c61d184f06e8c886e595e8a97ebd16 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov <[email protected]> Date: Thu, 14 Feb 2013 06:25:38 +0000 Subject: [PATCH] gnu: Remove a newline. * gnu/packages/base.scm (gcc-4.7): Remove the newline. --- gnu/packages/base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 23bf00b..5c39ec3 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -449,7 +449,7 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") ;; RUNPATH to GCC even when `libgcc_s' is not NEEDED. ;; There's not much that can be done to avoid it, though. (format #f "#define LIB_SPEC \"-L~a/lib %{!static:-rpath=~a/lib \ -%{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a~%" +%{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a" libc libc out out suffix)) (("#define STARTFILE_SPEC.*$" line) (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\" -- 1.8.0.2
From ad1536e4730b9d37a0519fdd29bdd8195554358d Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov <[email protected]> Date: Thu, 14 Feb 2013 06:36:23 +0000 Subject: [PATCH] gnu: Disable Libtool's testsuite. * gnu/packages/autotools.scm (libtool): Add '#:tests? #f'. --- gnu/packages/autotools.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index bc4dddc..e004dd9 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -195,7 +195,8 @@ Standards. Automake requires the use of Autoconf.") "out")) ; libltdl.so, ltdl.h, etc. (arguments - `(#:patches (list (assoc-ref %build-inputs "patch/skip-tests")) + `(#:tests? #f + #:patches (list (assoc-ref %build-inputs "patch/skip-tests")) #:phases (alist-cons-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) -- 1.8.0.2
From 31a7f172941c592f04f8f741b89e04a2a6677a76 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov <[email protected]> Date: Thu, 14 Feb 2013 06:14:48 +0000 Subject: [PATCH] gnu: Set 'ARCH' to 'mips'. * gnu/packages/linux.scm (linux-libre-headers): Set 'ARCH' to 'mips'. --- gnu/packages/linux.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 58cddc0..fe8148c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -29,20 +29,31 @@ #:use-module (gnu packages pkg-config) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module ((guix utils) #:select (%current-system))) (define-public linux-libre-headers (let* ((version* "3.3.8") (build-phase - '(lambda* (#:key system #:allow-other-keys) + (lambda () + `(lambda* (#:key system #:allow-other-keys) (let ((arch (car (string-split system #\-)))) (setenv "ARCH" (cond ((string=? arch "i686") "i386") + + ;; FIXME: The unquote below is just to + ;; avoid triggering a rebuild. Remove me + ;; on the next core-updates. + ,@(if (string-prefix? "mips" + (%current-system)) + `(((string-prefix? "mips" arch) + "mips")) + '()) (else arch))) (format #t "`ARCH' set to `~a'~%" (getenv "ARCH"))) (and (zero? (system* "make" "defconfig")) - (zero? (system* "make" "mrproper" "headers_check"))))) + (zero? (system* "make" "mrproper" "headers_check")))))) (install-phase `(lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -73,7 +84,7 @@ (guix build utils) (srfi srfi-1)) #:phases (alist-replace - 'build ,build-phase + 'build ,(build-phase) (alist-replace 'install ,install-phase (alist-delete 'configure %standard-phases))) -- 1.8.0.2
pgpIBDJl0slq1.pgp
Description: PGP signature
