From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
To: Guix-devel <guix-devel@gnu.org>
Subject: [PATCH] gnu: tbb: Set library rpath.
Date: Tue, 14 Apr 2015 14:19:24 +0200 [thread overview]
Message-ID: <idjwq1eykab.fsf@bimsb-sys02.mdc-berlin.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
Hi Guix,
the attached patch augments LDFLAGS indirectly over LIB_LINK_FLAGS with
the rpath flag for the library output of the package. This fixes rpath
problems with /lib/libtbbmalloc_proxy.so.2 and possibly others (see
http://hydra.gnu.org/build/367038/nixlog/2/raw) as reported by Ludo.
Note: I did not run the complete test suite again (because it takes a
very long time on my machine), and when tests are enabled a couple more
libraries are created. Since they all probably share LIB_LINK_FLAGS I
expect any problems there to also be fixed by this patch.
~~ Ricardo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-tbb-Set-library-rpath.patch --]
[-- Type: text/x-patch, Size: 1166 bytes --]
From 56246d7bf2f60272ceed63d9291f47f42431119b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 14 Apr 2015 14:11:42 +0200
Subject: [PATCH] gnu: tbb: Set library rpath.
* gnu/packages/tbb.scm (tbb)[arguments]: Add the rpath for lib directory of
output to LDFLAGS.
---
gnu/packages/tbb.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index 42670d7..3c41141 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -46,8 +46,13 @@
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
- #:phases (alist-delete
+ #:phases (alist-replace
'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "build/linux.gcc.inc"
+ (("LIB_LINK_FLAGS =")
+ (string-append "LIB_LINK_FLAGS = -Wl,-rpath="
+ (assoc-ref outputs "out") "/lib"))))
(alist-replace
'install
(lambda* (#:key outputs #:allow-other-keys)
--
2.1.0
next reply other threads:[~2015-04-14 12:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-14 12:19 Ricardo Wurmus [this message]
2015-04-15 19:56 ` [PATCH] gnu: tbb: Set library rpath 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=idjwq1eykab.fsf@bimsb-sys02.mdc-berlin.net \
--to=ricardo.wurmus@mdc-berlin.de \
--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).