summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-09-08 18:06:07 +0200
committerLudovic Courtès <ludo@gnu.org>2021-09-08 21:45:43 +0200
commitf83d7663eb7caebeb7462012a4a41ba21ba7e5a8 (patch)
tree4256dd261078c993ea675841439c6b5da9f30c90 /gnu
parent425799cb45473616fc884fd23c413ac4f3027729 (diff)
downloadguix-f83d7663eb7caebeb7462012a4a41ba21ba7e5a8.tar.gz
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".
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/base.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 9c9808fcfa..70eb135a1e 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"