From: Ricardo Wurmus <rekado@elephly.net>
To: Guix-devel <guix-devel@gnu.org>
Subject: [PATCH] Fix Ardour build.
Date: Mon, 11 May 2015 20:27:58 +0200 [thread overview]
Message-ID: <87d227ufyp.fsf@mango.localdomain> (raw)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-ardour-Extract-RUNPATH-phase.patch --]
[-- Type: text/x-patch, Size: 3697 bytes --]
From d17b74b96eb96fa20a0b685983bff0283325878d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 11 May 2015 20:24:59 +0200
Subject: [PATCH] gnu: ardour: Extract RUNPATH phase.
* gnu/packages/audio.scm (ardour-rpath-phase): New procedure.
* gnu/packages/audio.scm (ardour, ardour-3): Generate version-dependent build
phase with ardour-rpath-phase.
---
gnu/packages/audio.scm | 44 +++++++++++++++++++++++++-------------------
1 file changed, 25 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 543fe49..e15381b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -21,6 +21,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system waf)
@@ -128,6 +129,22 @@ attacks, performing pitch detection, tapping the beat and producing MIDI
streams from live audio.")
(license license:gpl3+)))
+(define (ardour-rpath-phase major-version)
+ `(lambda* (#:key outputs #:allow-other-keys)
+ (let ((libdir (string-append (assoc-ref outputs "out")
+ "/lib/ardour" ,major-version)))
+ (substitute* "wscript"
+ (("linker_flags = \\[\\]")
+ (string-append "linker_flags = [\""
+ "-Wl,-rpath="
+ libdir ":"
+ libdir "/backends" ":"
+ libdir "/engines" ":"
+ libdir "/panners" ":"
+ libdir "/surfaces" ":"
+ libdir "/vamp" "\"]"))))
+ #t))
+
(define-public ardour-3
(package
(name "ardour")
@@ -158,24 +175,7 @@ namespace ARDOUR { const char* revision = \"3.5-403-gec2cb31\" ; }"))))
(modify-phases %standard-phases
(add-after
'unpack 'set-rpath-in-LDFLAGS
- (lambda _
- (substitute* "wscript"
- (("linker_flags = \\[\\]")
- (string-append "linker_flags = [\""
- "-Wl,-rpath="
- (assoc-ref %outputs "out")
- "/lib/ardour3/" ":"
- (assoc-ref %outputs "out")
- "/lib/ardour3/backends" ":"
- (assoc-ref %outputs "out")
- "/lib/ardour3/engines" ":"
- (assoc-ref %outputs "out")
- "/lib/ardour3/panners" ":"
- (assoc-ref %outputs "out")
- "/lib/ardour3/surfaces" ":"
- (assoc-ref %outputs "out")
- "/lib/ardour3/vamp" "\"]")))
- #t)))
+ ,(ardour-rpath-phase (version-prefix version 1))))
#:tests? #f ; no check target
#:python ,python-2))
(inputs
@@ -246,7 +246,13 @@ namespace ARDOUR { const char* revision = \"4.0\" ; }"))))
(sha256
(base32
"0a8bydc24xv0cahdqfaxdmi1f43cyr9psiyshxpbrkdqw2c7a4xi"))
- (file-name (string-append name "-" version))))))
+ (file-name (string-append name "-" version))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments ardour-3)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'set-rpath-in-LDFLAGS
+ ,(ardour-rpath-phase (version-prefix version 1)))))))))
(define-public azr3
(package
--
2.1.0
next reply other threads:[~2015-05-11 18:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 18:27 Ricardo Wurmus [this message]
2015-05-11 19:14 ` [PATCH] Fix Ardour build Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d227ufyp.fsf@mango.localdomain \
--to=rekado@elephly.net \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).