guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: lensfun: Fix building on non-Intel machines.


From: Efraim Flashner
Subject: 01/01: gnu: lensfun: Fix building on non-Intel machines.
Date: Thu, 15 Jun 2017 02:19:12 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit 4dbef2397f05493e1d59f3112cda94729f5968b5
Author: Efraim Flashner <address@hidden>
Date:   Thu Jun 15 09:15:25 2017 +0300

    gnu: lensfun: Fix building on non-Intel machines.
    
    * gnu/packages/photo.scm (lensfun)[arguments]: On non-Intel machines,
    don't build with architecture specific instructions.
---
 gnu/packages/photo.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 1fae0e4..9251382 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014, 2015 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2015 Andreas Enge <address@hidden>
-;;; Copyright © 2016 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
 ;;; Copyright © 2017 Roel Janssen <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -54,7 +54,9 @@
   #:use-module (gnu packages tex)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xfig)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xml)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26))
 
 (define-public libraw
   (package
@@ -285,7 +287,14 @@ scene to produce an image that looks much like a 
tone-mapped image.")
                (base32
                 "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf"))))
     (build-system cmake-build-system)
-    (arguments `(#:tests? #f)) ; There are no tests to run.
+    (arguments
+     `(,@(if (any (cute string-prefix? <> (or (%current-system)
+                                              (%current-target-system)))
+                  '("x86_64" "i686"))
+        ;; SSE and SSE2 are supported only on Intel processors.
+        '()
+        '(#:configure-flags '("-DBUILD_FOR_SSE=OFF" "-DBUILD_FOR_SSE2=OFF")))
+       #:tests? #f)) ; There are no tests to run.
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs



reply via email to

[Prev in Thread] Current Thread [Next in Thread]