From fa58a0a62e28db8f351222ee238ebb929b2b3bdb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Jan 2018 23:11:05 +0200 Subject: gnu: libb2: Only check for CPU optimisations on Intel architectures. * gnu/packages/crypto.scm (libb2)[arguments]: Only pass the configure-flag '--enable-fat' on i686 or x86_64. --- gnu/packages/crypto.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 4ecdaa8f7f..e616c9223f 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2017 Eric Bavier ;;; Copyright © 2017 Pierre Langlois +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,7 +57,9 @@ (define-module (gnu packages crypto) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) - #:use-module (guix build-system perl)) + #:use-module (guix build-system perl) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define-public libsodium (package @@ -634,8 +637,14 @@ (define-public libb2 ("libtool" ,libtool))) (arguments `(#:configure-flags - (list "--enable-fat" ; detect optimisations at run time... - "--disable-native") ; ...not build time + (list + ,@(if (any (cute string-prefix? <> (or (%current-system) + (%current-target-system))) + '("x86_64" "i686")) + ;; fat only checks for Intel optimisations + '("--enable-fat") + '()) + "--disable-native") ; don't optimise at build time. #:phases (modify-phases %standard-phases (add-after 'unpack 'bootstrap -- cgit v1.2.3