From patchwork Mon Mar 4 12:04:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 1321 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 42FCF16CF8; Mon, 4 Mar 2019 12:25:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CD39716CF5 for ; Mon, 4 Mar 2019 12:25:16 +0000 (GMT) Received: from localhost ([127.0.0.1]:53090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0mei-0001y9-2P for patchwork@mira.cbaines.net; Mon, 04 Mar 2019 07:25:16 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#34745] [PATCH core-updates] gnu: libgc: Update to 7.6.12. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Mar 2019 12:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34745@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155170109129508 (code B ref -1); Mon, 04 Mar 2019 12:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Mar 2019 12:04:51 +0000 Received: from localhost ([127.0.0.1]:59198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h0mKw-0007fs-Ua for submit@debbugs.gnu.org; Mon, 04 Mar 2019 07:04:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h0mKu-0007fc-E6 for submit@debbugs.gnu.org; Mon, 04 Mar 2019 07:04:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:33452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h0mKp-0002qy-77 for submit@debbugs.gnu.org; Mon, 04 Mar 2019 07:04:43 -0500 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 mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 04 Mar 2019 07:04:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=VZNdEpGNCxLMdrOGo95ycydovw JVBIiMuPsjf1WgQvo=; b=vwWet0TuNkPMpdW7WFR9jasuTOb2WjtGEnF//cQNLi 8U87zOrn9YwfF0LUSmrnexe+nwCHDTq9xTk0ovZmp74jAUwVqrF112VmvEeutMPC mODPprW1hXITZItGOZB7s9BZvtGX71mIt/aa0xUeEg73LHslH0pH+n7DlReAfO4z 3ocH7sp1eLmcWJEqRNZYRN7Tl9gFAH4r/GZJRJ8wu5iRwMyJBFdQJSfhokNElv2H 3nie5vliSGvtj258T/n5mNU4HcB8FBDtushGTnZVeZQ9/18lJWI5ZOzx0WBHZ7MN 4sDlo+utmi/j0TUKtZA3mBApu3lmRrRbsLTx+uWc6cxA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=VZNdEpGNCxLMdrOGo 95ycydovwJVBIiMuPsjf1WgQvo=; b=0t6h9slNzh8ixUZovzFJz/0r1njEfNVs9 gRNt9UJY7raCjexeTVG0OttKPcB0GLuRUC6RTVwCDUhjQ6S6hrxsLOMbi8PIIoMy mPKr238V1KYE4S6Exa3nwDpBcffaIqFznUunaQWMNYgPvAFMIeWQiTsXRVTkLqg1 zeBJwYPQrDFI6VuNjnPwST+3qSQpOCzZT1P57z0K/FoZWOffPQCLkq2zfuwXTfCP EoxxmJG6OSTe8f4SRI5gyb87WBoYlj2nR/jEtLDdpfz911Sf+UuGmfis+588HMTW hYBRSEz1KOZV6gvYsKCmc4YgNBT4I/XVPxgBYiwVL2TbwCBl3YKug== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrfedugdefhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgr ihhlrdgtohhmqeenucffohhmrghinhepphgtrdhinhdpghhithhhuhgsrdgtohhmnecukf hppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggr khhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: 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> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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"))