[PATCH] Try to fix ZynAddSubFx on non-x86.

[PATCH] Try to fix ZynAddSubFx on non-x86.

[Ricardo Wurmus]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-zynaddsubfx-Remove-SSE-flags-from-generic-target.patch --]
[-- Type: text/x-patch, Size: 1212 bytes --]

From eb21775d3fa90fa80e346462ae72a9b77bf3dc2e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 2 Nov 2015 22:03:25 +0100
Subject: [PATCH] gnu: zynaddsubfx: Remove SSE flags from generic target.

* gnu/packages/music.scm (zynaddsubfx)[arguments]: Add phase to move SSE
  compiler flags from generic to specific targets.
---
 gnu/packages/music.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 94ca5a5..73d0289 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -889,6 +889,16 @@ browser.")
                (base32
                 "01c4v5lbzard6y00cjq3b6a50cafqwfwibzng9gdsajczhnbkqz2"))))
     (build-system cmake-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-sse-flags-from-generic-target
+          (lambda _
+            (substitute* "src/CMakeLists.txt"
+              (("-msse -msse2 -mfpmath=sse") "")
+              (("-march=(athlon64|core2)" flag)
+               (string-append flag " -msse -msse2 -mfpmath=sse")))
+            #t)))))
     (inputs
      `(("liblo" ,liblo)
        ("ntk" ,ntk)
-- 
2.5.0

Re: [PATCH] Try to fix ZynAddSubFx on non-x86.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> From eb21775d3fa90fa80e346462ae72a9b77bf3dc2e Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Mon, 2 Nov 2015 22:03:25 +0100
> Subject: [PATCH] gnu: zynaddsubfx: Remove SSE flags from generic target.
>
> * gnu/packages/music.scm (zynaddsubfx)[arguments]: Add phase to move SSE
>   compiler flags from generic to specific targets.

[...]

> +         (add-after 'unpack 'remove-sse-flags-from-generic-target
> +          (lambda _
> +            (substitute* "src/CMakeLists.txt"
> +              (("-msse -msse2 -mfpmath=sse") "")
> +              (("-march=(athlon64|core2)" flag)
> +               (string-append flag " -msse -msse2 -mfpmath=sse")))

With a comment explaining why this is moving things to the right place,
it LGTM!

Thanks,
Ludo’.