02/05: FIXME: Downgrade glibc to 2.30.

[guix-commits]

efraim pushed a commit to branch wip-ppc
in repository guix.

commit 58d5ccdd50a72ca7385c7b3abea3eca2b3d56051
Author: Efraim Flashner <address@hidden>
AuthorDate: Fri Apr 17 14:12:41 2020 +0300

    FIXME: Downgrade glibc to 2.30.
    
    glibc-2.31 produces unusable bootstrap-binaries on powerpc-linux-gnu.
    Use 2.30 for bootstrap-binaries and then return to 2.31 afterward.
---
 gnu/packages/base.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 9899067..a3df7c7 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -646,7 +646,7 @@ the store.")
 
 (export make-ld-wrapper)
 
-(define-public glibc
+(define-public glibc-2.31
   ;; This is the GNU C Library, used on GNU/Linux and GNU/Hurd.  Prior to
   ;; version 2.28, GNU/Hurd used a different glibc branch.
   (package
@@ -905,10 +905,10 @@ with the Linux kernel.")
 
 (define-public glibc-2.30
   (package
-    (inherit glibc)
+    (inherit glibc-2.31)
     (version "2.30")
     (source (origin
-              (inherit (package-source glibc))
+              (inherit (package-source glibc-2.31))
               (uri (string-append "mirror://gnu/glibc/glibc-" version 
".tar.xz"))
               (sha256
                (base32
@@ -921,6 +921,8 @@ with the Linux kernel.")
                                        
"glibc-reinstate-prlimit64-fallback.patch"
                                        
"glibc-2.29-supported-locales.patch"))))))
 
+(define glibc glibc-2.30)
+
 (define-public glibc-2.29
   (package
     (inherit glibc)