[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/06: Revert "gnu: nss: Build for aarch64-linux with 64-bit support."
From: |
Marius Bakke |
Subject: |
01/06: Revert "gnu: nss: Build for aarch64-linux with 64-bit support." |
Date: |
Wed, 15 Mar 2017 12:59:02 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit adb984d23c003d5d48ada47bf5ad8105a3b8e412
Author: Marius Bakke <address@hidden>
Date: Wed Mar 15 17:51:23 2017 +0100
Revert "gnu: nss: Build for aarch64-linux with 64-bit support."
Temporary revert to fix messy merge conflict!
This reverts commit 568004c3c9a87b95d4e19a3187f336a20d33440a.
---
gnu/packages/gnuzilla.scm | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 79bf103..55dfda4 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
-;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2016 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Alex Griffin <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -23,7 +23,6 @@
(define-module (gnu packages gnuzilla)
#:use-module ((srfi srfi-1) #:hide (zip))
- #:use-module (ice-9 match)
#:use-module (gnu packages)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
@@ -204,7 +203,7 @@ in the Mozilla clients.")
(build-system gnu-build-system)
(outputs '("out" "bin"))
(arguments
- `(#:parallel-build? #f ; not supported
+ '(#:parallel-build? #f ; failed
#:make-flags
(let* ((out (assoc-ref %outputs "out"))
(nspr (string-append (assoc-ref %build-inputs "nspr")))
@@ -224,14 +223,11 @@ in the Mozilla clients.")
#:phases
(modify-phases %standard-phases
(replace 'configure
- (lambda _
+ (lambda* (#:key system inputs #:allow-other-keys)
(setenv "CC" "gcc")
;; Tells NSS to build for the 64-bit ABI if we are 64-bit system.
- ,@(match (%current-system)
- ((or "x86_64-linux" "aarch64-linux")
- `((setenv "USE_64" "1")))
- (_
- '()))
+ (when (string-prefix? "x86_64" system)
+ (setenv "USE_64" "1"))
#t))
(replace 'check
(lambda _
- branch core-updates updated (378640e -> b8f99f4), Marius Bakke, 2017/03/15
- 01/06: Revert "gnu: nss: Build for aarch64-linux with 64-bit support.",
Marius Bakke <=
- 06/06: gnu: nss, nss-certs: Update to 3.29.3., Marius Bakke, 2017/03/15
- 03/06: gnu: nss: Use 'modify-phases' syntax., Marius Bakke, 2017/03/15
- 05/06: gnu: nss: Increase test timeouts., Marius Bakke, 2017/03/15
- 02/06: Merge branch 'master' into core-updates, Marius Bakke, 2017/03/15
- 04/06: Revert "Revert "gnu: nss: Build for aarch64-linux with 64-bit support."", Marius Bakke, 2017/03/15