From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] gnu: tbb: Set library rpath. Date: Tue, 14 Apr 2015 14:19:24 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YhzoY-0003Qx-Jq for guix-devel@gnu.org; Tue, 14 Apr 2015 08:19:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YhzoT-000441-5z for guix-devel@gnu.org; Tue, 14 Apr 2015 08:19:38 -0400 Received: from venus.bbbm.mdc-berlin.de ([141.80.25.30]:42415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YhzoS-00042v-TL for guix-devel@gnu.org; Tue, 14 Apr 2015 08:19:33 -0400 Received: from localhost (localhost [127.0.0.1]) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTP id DB3FD3809CA for ; Tue, 14 Apr 2015 14:19:30 +0200 (CEST) Received: from venus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (venus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id msWzbWIlqDfh for ; Tue, 14 Apr 2015 14:19:25 +0200 (CEST) Received: from HTCAONE.mdc-berlin.net (mab.citx.mdc-berlin.de [141.80.36.102]) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTP for ; Tue, 14 Apr 2015 14:19:25 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Guix-devel --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0001-gnu-tbb-Set-library-rpath.patch" >From 56246d7bf2f60272ceed63d9291f47f42431119b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus 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 --=-=-=--