guix-commits
[Top][All Lists]
Advanced

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

02/04: gnu: commencement: Build fix for python-boot0.


From: guix-commits
Subject: 02/04: gnu: commencement: Build fix for python-boot0.
Date: Tue, 14 Apr 2020 05:45:50 -0400 (EDT)

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit f903badb597c9ad5b2abfaf5de8ce173e13f41cb
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Mon Apr 13 00:11:27 2020 +0200

    gnu: commencement: Build fix for python-boot0.
    
    Unlike during a non-chroot'ed build on Debian/Hurd, there is no 
/usr/include.
    
    * gnu/packages/commencement.scm (python-boot0)[arguments]: Add `fix-regen'
    stage to correct a reference to "/usr".
---
 gnu/packages/commencement.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 41d7772..06295d1 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3217,7 +3217,16 @@ memoized as a function of '%current-system'."
                      ;; built, since it requires Linux headers.
                      (("'linux', ") ""))
                    #t))
-               (delete 'set-TZDIR)))
+               (delete 'set-TZDIR)
+               ;; TODO: probably lift this to "python-2.7" or "python-3.8"
+               ,@(if (hurd-system?)
+                     `((add-before 'build 'fix-regen
+                         (lambda* (#:key inputs #:allow-other-keys)
+                           (let ((libc (assoc-ref inputs "libc")))
+                             (substitute* "Lib/plat-generic/regen"
+                               (("/usr/include/") (string-append libc 
"/include/")))
+                             #t))))
+                     '())))
            ((#:tests? _ #f) #f))))))
 
 (define/system-dependent ld-wrapper-boot0



reply via email to

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