From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: [PATCH] Add MOSAIK. Date: Fri, 23 Oct 2015 10:42:49 +0200 Message-ID: References: <87a8reyhz0.fsf@gnu.org> <20151023080219.GB7097@debian> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpXwF-0005mL-5N for guix-devel@gnu.org; Fri, 23 Oct 2015 04:43:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZpXwB-00056Y-TU for guix-devel@gnu.org; Fri, 23 Oct 2015 04:43:03 -0400 In-Reply-To: <20151023080219.GB7097@debian> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Andreas Enge Cc: guix-devel --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable > Mosaik fails on all architectures except for x86_64. Should it be disab= led > or are there configure flags to make it work elsewhere? I think this is caused by =E2=80=98includes/linux.inc=E2=80=99, which is = unconditionally included by default. Disabling the line include includes/$(BLD_PLATFORM).inc should be sufficient to fix this. Alternatively, we could set BLD_PLATFORM (to something other than just =E2=80=9Clinux=E2=80=9D on non-x86_64) and patch =E2=80=9Cinclude=E2=80=9D= to read =E2=80=9C-include=E2=80=9D, so that it doesn=E2=80=99t cause an error when the file does not exist. That=E2=80=99s what the attached patch does. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0001-gnu-mosaik-Enable-optimizations-only-on-x86_64.patch" >From 156df9fcf8a7b9a5f61b29db366f6b780082c81a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 23 Oct 2015 10:35:00 +0200 Subject: [PATCH] gnu: mosaik: Enable optimizations only on x86_64. * gnu/packages/bioinformatics.scm (mosaik)[arguments]: Set BLD_PLATFORM make flag; add build phase to make include optional. --- gnu/packages/bioinformatics.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e1ae107..6424dde 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2266,9 +2266,21 @@ viewer.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc") + #:make-flags + (list "CC=gcc" + (string-append "BLD_PLATFORM=" + (let ((system ,(or (%current-target-system) + (%current-system)))) + (if (string-prefix? "x86_64" system) + "linux" + system)))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-optimization-optional + (lambda _ + (substitute* "src/Makefile" + (("^include") "-include")) + #t)) (replace 'configure (lambda _ (chdir "src") #t)) (replace 'install -- 2.1.0 --=-=-=--