From bd0c62315b2ed400f3b58d457b5d2e4efb6ea138 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Mar 2017 22:44:26 +0100 Subject: gnu: bristol: Fix build failure with alsa-lib 1.1.x. * gnu/packages/music.scm (bristol)[arguments]: Add build phase to fix build failure with alsa-lib 1.1.x. --- gnu/packages/music.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 87b6d5b9b3..5067ee8afa 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1236,6 +1236,13 @@ mixing, FFT scopes, MIDI automation and full scriptability in Scheme.") (substitute* "bristol/Makefile.in" (("-msse -mfpmath=sse") ""))) #t)) + ;; alsa-lib 1.1.x no longer provides iatomic.h. That's okay because + ;; bristol actually doesn't use it. + (add-after 'unpack 'do-not-use-alsa-iatomic + (lambda _ + (substitute* "libbristolaudio/audioEngineJack.c" + (("#include ") "")) + #t)) ;; We know that Bristol has been linked with JACK and we don't have ;; ldd, so we can just skip this check. (add-after 'unpack 'do-not-grep-for-jack -- cgit v1.2.3 From c3913fac57c557ba5ebc98c646f75c7000ab8aa7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Mar 2017 10:11:56 +0200 Subject: gnu: powertabeditor: Link with pthread. * gnu/packages/music.scm (powertabeditor)[arguments]: Link with "-lpthread" to fix build with GCC 5. --- gnu/packages/music.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 198c6f1fed..3946c3a646 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -906,6 +906,7 @@ add_library( rapidjson INTERFACE IMPORTED )")) (lambda* (#:key inputs #:allow-other-keys) ;; Link with required static libraries, because we're not ;; using the bundled version of withershins. + ;; Also add pthread for fixing a linker error. (substitute* "source/build/CMakeLists.txt" (("withershins" line) (string-append line "\n" @@ -914,6 +915,7 @@ add_library( rapidjson INTERFACE IMPORTED )")) (assoc-ref inputs "libiberty") "/lib/libiberty.a\n" "dl\n" + "pthread\n" "z\n"))) #t))))) (inputs -- cgit v1.2.3