From ce7e361fa30d3dbe5c1da35f52dade2eb829aed7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 4 Jul 2017 15:21:33 +0300 Subject: gnu: gemma: Fix building on non-Intel architectures. * gnu/packages/patches/gemma-intel-compat.patch: New file. * gnu/packages/bioinformatics.scm (gemma)[source]: Add patch. [arguments]: Add NO_INTEL_COMPAT flag on non-Intel architectures. * gnu/local.mk (dist_patch_DATA): Register patch. --- gnu/packages/bioinformatics.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0ff0bbb9e3..55c2975a1e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016 Pjotr Prins ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2016 Raoul Bonnal ;;; @@ -99,7 +99,7 @@ (define-module (gnu packages bioinformatics) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26)) + #:use-module (ice-9 match)) (define-public r-ape (package @@ -2719,7 +2719,8 @@ (define-public gemma (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "055ynn16gd12pf78n4vr2a9jlwsbwzajpdnf2y2yilg1krfff222")))) + "055ynn16gd12pf78n4vr2a9jlwsbwzajpdnf2y2yilg1krfff222")) + (patches (search-patches "gemma-intel-compat.patch")))) (inputs `(("gsl" ,gsl) ("lapack" ,lapack) @@ -2727,11 +2728,13 @@ (define-public gemma (build-system gnu-build-system) (arguments `(#:make-flags - '(,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) - '("x86_64" "mips64el" "aarch64")) - '("FORCE_DYNAMIC=1") ; use shared libs - '("FORCE_DYNAMIC=1" "FORCE_32BIT=1"))) + '(,@(match (%current-system) + ("x86_64-linux" + '("FORCE_DYNAMIC=1")) + ("i686-linux" + '("FORCE_DYNAMIC=1" "FORCE_32BIT=1")) + (_ + '("FORCE_DYNAMIC=1" "NO_INTEL_COMPAT=1")))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3