02/02: gnu: libgc: Promote libgc@8 to the default libgc.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 2bd9410e171c5359bad24f187e74b23d4174b39e
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Mar 27 19:35:54 2020 +0100

    gnu: libgc: Promote libgc@8 to the default libgc.
    
    * gnu/packages/bdw-gc.scm (libgc): Update to 8.0.4.
    [arguments]: Remove #:phases.
    [inputs]: Remove LIBATOMIC-OPS.
    (libgc-8.0): Remove variable.
    (libgc-7): New variable.
---
 gnu/packages/bdw-gc.scm | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm
index 73b0c07..5023c3b 100644
--- a/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@ -3,7 +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>
+;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,14 +31,14 @@
 (define-public libgc
   (package
    (name "libgc")
-   (version "7.6.12")
+   (version "8.0.4")
    (source (origin
             (method url-fetch)
             (uri (string-append "https://github.com/ivmai/bdwgc/releases";
                                 "/download/v" version "/gc-" version 
".tar.gz"))
             (sha256
              (base32
-              "10jhhi79d5brwlsyhwgpnrmc8nhlf7aan2lk9xhgihk5jc6srbvc"))))
+              "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
@@ -54,21 +54,8 @@
        ,@(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"))
    (synopsis "The Boehm-Demers-Weiser conservative garbage collector
 for C and C++")
@@ -91,17 +78,18 @@ C or C++ programs, though that is not its primary goal.")
 
    (license (x11-style (string-append home-page "license.txt")))))
 
-(define-public libgc-8.0
+(define-public libgc-7
   (package
    (inherit libgc)
-   (version "8.0.4")
+   (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
-               "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"))))))
+               "10jhhi79d5brwlsyhwgpnrmc8nhlf7aan2lk9xhgihk5jc6srbvc"))))
+   (propagated-inputs `(("libatomic-ops" ,libatomic-ops)))))
 
 (define-public libgc/back-pointers
   (package/inherit