guix-commits
[Top][All Lists]
Advanced

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

01/01: gnu: obs: Remove compiler flags for non-Intel hardware.


From: Efraim Flashner
Subject: 01/01: gnu: obs: Remove compiler flags for non-Intel hardware.
Date: Tue, 12 Jul 2016 15:47:58 +0000 (UTC)

efraim pushed a commit to branch master
in repository guix.

commit 08858812b57796fe5c2acee9f1675523333a149c
Author: Efraim Flashner <address@hidden>
Date:   Tue Jul 12 17:45:13 2016 +0300

    gnu: obs: Remove compiler flags for non-Intel hardware.
    
    * gnu/packages/video.scm (obs)[arguments]: If compiling for arm or mips
    devices then don't add Intel specific compiler flags.
---
 gnu/packages/video.scm |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 8d7d332..eb0fdba 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -26,6 +26,8 @@
 
 (define-module (gnu packages video)
   #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix utils)
   #:use-module (guix packages)
@@ -1403,7 +1405,21 @@ be used for realtime video capture via Linux-specific 
APIs.")
                (base32
                 "18fycg7xlj2i89wdb9c5js0bnl964s1lpmnvmfyj11zi9k061wsg"))))
     (build-system cmake-build-system)
-    (arguments '(#:tests? #f)) ; no tests
+    (arguments
+     `(#:tests? #f ; no tests
+       ,@(if (any (cute string-prefix? <> (or (%current-target-system)
+                                              (%current-system)))
+                  '("arm" "mips"))
+           '(#:phases
+             (modify-phases %standard-phases
+             (add-after 'unpack 'remove-architecture-specific-instructions
+               ;; non-Intel platforms fail to build with the architecture
+               ;; specific compiler flags included by default.
+               (lambda _
+                 (substitute* "libobs/CMakeLists.txt"
+                              (("if\\(NOT MSVC\\)") "if(MSVC)"))
+                 #t))))
+           '())))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs



reply via email to

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