From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0mL9-0001x4-FJ for guix-patches@gnu.org; Mon, 04 Mar 2019 07:05:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0mL8-000353-H0 for guix-patches@gnu.org; Mon, 04 Mar 2019 07:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45654) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0mL8-00034k-Co for guix-patches@gnu.org; Mon, 04 Mar 2019 07:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h0mL8-0007gQ-3Y for guix-patches@gnu.org; Mon, 04 Mar 2019 07:05:02 -0500 Subject: [bug#34745] [PATCH core-updates] gnu: libgc: Update to 7.6.12. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:47291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0mKo-0001dw-2H for guix-patches@gnu.org; Mon, 04 Mar 2019 07:04:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0mKn-0002q7-5B for guix-patches@gnu.org; Mon, 04 Mar 2019 07:04:42 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:51623) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h0mKm-0002oi-JR for guix-patches@gnu.org; Mon, 04 Mar 2019 07:04:41 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 673F822044 for ; Mon, 4 Mar 2019 07:04:38 -0500 (EST) Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 7249C10318 for ; Mon, 4 Mar 2019 07:04:37 -0500 (EST) From: Marius Bakke Date: Mon, 4 Mar 2019 13:04:35 +0100 Message-Id: <20190304120435.2276-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34745@debbugs.gnu.org * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.12. [arguments]: Add phase to avoid libatomic-ops propagation. --- gnu/packages/bdw-gc.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 041e142ded..ba010ceee5 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -30,14 +30,14 @@ (define-public libgc (package (name "libgc") - (version "7.6.8") + (version "7.6.12") (source (origin (method url-fetch) (uri (string-append "https://github.com/ivmai/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "0n720a0i584ghcwmdsjiq6bl9ig0p9mrja29rp4cgsqvpz6wa2h4")))) + "10jhhi79d5brwlsyhwgpnrmc8nhlf7aan2lk9xhgihk5jc6srbvc")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -53,7 +53,19 @@ ,@(if (hurd-triplet? (or (%current-system) (%current-target-system))) '("--disable-gcj-support") - '())))) + '())) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-pc-file + (lambda* (#:key inputs #:allow-other-keys) + (let ((libatomic-ops (assoc-ref inputs "libatomic-ops"))) + ;; GC 7.6.10 and later includes -latomic_ops in the + ;; pkg-config file. To avoid propagation, insert an + ;; absolute reference so dependent programs can find it. + (substitute* "bdw-gc.pc.in" + (("@ATOMIC_OPS_LIBS@" match) + (string-append "-L" libatomic-ops "/lib " + match))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libatomic-ops" ,libatomic-ops))) (outputs '("out" "debug")) -- 2.21.0