guix-commits
[Top][All Lists]
Advanced

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

02/03: gnu: glibc-2.21: Fix substitutes in glibc-2.21.


From: Efraim Flashner
Subject: 02/03: gnu: glibc-2.21: Fix substitutes in glibc-2.21.
Date: Mon, 11 Jul 2016 18:10:14 +0000 (UTC)

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

commit 38e9373b0d668d9e8347e0d6adce218480d41661
Author: Efraim Flashner <address@hidden>
Date:   Mon Jul 11 10:23:08 2016 +0300

    gnu: glibc-2.21: Fix substitutes in glibc-2.21.
    
    * gnu/packages/base.scm (glibc-2.21)[arguments]: Add back substitution
    for /bin/pwd which was removed in the update of glibc to 2.23.
---
 gnu/packages/base.scm |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 422424c..ed1f84c 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -732,7 +732,16 @@ GLIBC/HURD for a Hurd host"
               (sha256
                (base32
                 "1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf"))
-              (patches (search-patches "glibc-ldd-x86_64.patch"))))))
+              (patches (search-patches "glibc-ldd-x86_64.patch"))))
+    (arguments
+      (substitute-keyword-arguments (package-arguments glibc)
+        ((#:phases phases)
+         `(modify-phases ,phases
+            (add-before 'configure 'fix-pwd
+              (lambda _
+                ;; Use `pwd' instead of `/bin/pwd' for glibc-2.21
+                (substitute* "configure"
+                  (("/bin/pwd") "pwd"))))))))))
 
 (define-public glibc-locales
   (package



reply via email to

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