mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
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.
This commit is contained in:
parent
513dc568ca
commit
fa58a0a62e
1 changed files with 12 additions and 3 deletions
|
@ -7,6 +7,7 @@
|
||||||
;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
|
;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
|
||||||
;;; Copyright © 2016, 2017 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2016, 2017 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
|
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
|
||||||
|
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -56,7 +57,9 @@ (define-module (gnu packages crypto)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
#:use-module (guix build-system cmake)
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (guix build-system gnu)
|
#: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
|
(define-public libsodium
|
||||||
(package
|
(package
|
||||||
|
@ -634,8 +637,14 @@ (define-public libb2
|
||||||
("libtool" ,libtool)))
|
("libtool" ,libtool)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
(list "--enable-fat" ; detect optimisations at run time...
|
(list
|
||||||
"--disable-native") ; ...not build time
|
,@(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
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'bootstrap
|
(add-after 'unpack 'bootstrap
|
||||||
|
|
Loading…
Reference in a new issue