[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/11: gnu: libgc: Update to 7.6.12.
From: |
guix-commits |
Subject: |
03/11: gnu: libgc: Update to 7.6.12. |
Date: |
Sun, 10 Mar 2019 13:51:32 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit b0f5ec4ffb9fd509c84c0fcf125b2e038e543ebc
Author: Marius Bakke <address@hidden>
Date: Mon Mar 4 13:00:08 2019 +0100
gnu: libgc: Update to 7.6.12.
* gnu/packages/bdw-gc.scm (libgc): Update to 7.6.12.
[arguments]: Add phase to avoid libatomic-ops propagation.
---
gnu/packages/bdw-gc.scm | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm
index 041e142..7196ffc 100644
--- a/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014 Mark H Weaver <address@hidden>
;;; Copyright © 2016, 2018 Leo Famulari <address@hidden>
;;; Copyright © 2017 Rene Saavedra <address@hidden>
+;;; Copyright © 2019 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,14 +31,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 +54,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"))
- branch core-updates updated (b4d7689 -> 5a45765), guix-commits, 2019/03/10
- 11/11: gnu: python-mako: Fix FTBFS with Pytest 4., guix-commits, 2019/03/10
- 05/11: gnu: c-ares: Update to 1.15.0., guix-commits, 2019/03/10
- 07/11: gnu: lz4: Update to 1.8.3., guix-commits, 2019/03/10
- 08/11: gnu: python-chardet: Disable tests., guix-commits, 2019/03/10
- 03/11: gnu: libgc: Update to 7.6.12.,
guix-commits <=
- 10/11: gnu: nghttp2: Update to 1.37.0., guix-commits, 2019/03/10
- 06/11: gnu: nasm: Update to 2.14.02., guix-commits, 2019/03/10
- 02/11: gnu: libatomic-ops: Update to 7.6.10., guix-commits, 2019/03/10
- 01/11: Merge branch 'staging' into core-updates, guix-commits, 2019/03/10
- 09/11: gnu: python-babel: Disable tests that are incompatible with Pytest 4., guix-commits, 2019/03/10
- 04/11: gnu: Use OpenSSL 1.1 as the default OpenSSL package., guix-commits, 2019/03/10