guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: gnu: glibc@2.29: Fix build error.


From: guix-commits
Subject: 03/03: gnu: glibc@2.29: Fix build error.
Date: Wed, 8 Sep 2021 15:46:46 -0400 (EDT)

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

commit f83d7663eb7caebeb7462012a4a41ba21ba7e5a8
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Sep 8 18:06:07 2021 +0200

    gnu: glibc@2.29: Fix build error.
    
    * gnu/packages/base.scm (glibc-2.29): Inherit from GLIBC-2.30.
    [sources]: Use "glibc-skip-c++.patch".
---
 gnu/packages/base.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 9c9808f..70eb135 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -987,7 +987,7 @@ with the Linux kernel.")
 
 (define-public glibc-2.29
   (package
-    (inherit glibc)
+    (inherit glibc-2.30)
     (version "2.29")
     (source (origin
               (inherit (package-source glibc))
@@ -995,7 +995,8 @@ with the Linux kernel.")
               (sha256
                (base32
                 "0jzh58728flfh939a8k9pi1zdyalfzlxmwra7k0rzji5gvavivpk"))
-              (patches (search-patches "glibc-ldd-x86_64.patch"
+              (patches (search-patches "glibc-skip-c++.patch"
+                                       "glibc-ldd-x86_64.patch"
                                        "glibc-CVE-2019-7309.patch"
                                        "glibc-CVE-2019-9169.patch"
                                        "glibc-2.29-git-updates.patch"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]