me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Efraim Flashner 2018-01-09 23:11:05 +02:00
parent 513dc568ca
commit fa58a0a62e
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/crypto.scm
View File

@ -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 @@
#: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 @@ data on your platform, so the seed itself will be as random as possible.
("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