* [bug#34745] [PATCH core-updates] gnu: libgc: Update to 7.6.12.
@ 2019-03-04 12:04 Marius Bakke
2019-03-10 17:55 ` bug#34745: " Marius Bakke
0 siblings, 1 reply; 2+ messages in thread
From: Marius Bakke @ 2019-03-04 12:04 UTC (permalink / raw)
To: 34745
* 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#34745: [PATCH core-updates] gnu: libgc: Update to 7.6.12.
2019-03-04 12:04 [bug#34745] [PATCH core-updates] gnu: libgc: Update to 7.6.12 Marius Bakke
@ 2019-03-10 17:55 ` Marius Bakke
0 siblings, 0 replies; 2+ messages in thread
From: Marius Bakke @ 2019-03-10 17:55 UTC (permalink / raw)
To: 34745-done
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.12.
> [arguments]: Add phase to avoid libatomic-ops propagation.
Pushed in b0f5ec4ffb9fd509c84c0fcf125b2e038e543ebc.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-10 18:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-04 12:04 [bug#34745] [PATCH core-updates] gnu: libgc: Update to 7.6.12 Marius Bakke
2019-03-10 17:55 ` bug#34745: " Marius Bakke
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.