janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 3e32e0bd93f21a725b460f2cbc8de8b92f6e5971
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Mon Apr 13 07:47:38 2020 +0200
gnu: python: Build fix for the Hurd.
Unlike during a non-chroot'ed build on Debian/Hurd, there is no
/usr/include.
* gnu/packages/python.scm (python-2.7)[arguments]: Add `fix-regen'
stage to correct a reference to "/usr".
---
gnu/packages/python.scm | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f0a6193..4ae4f8e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -58,6 +58,7 @@
;;; Copyright © 2018 Luther Thompson <[email protected]>
;;; Copyright © 2018 Vagrant Cascadian <[email protected]>
;;; Copyright © 2019 Tanguy Le Carrour <[email protected]>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -81,6 +82,7 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
#:use-module (gnu packages dbm)
+ #:use-module (gnu packages hurd)
#:use-module (gnu packages libffi)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages readline)
@@ -197,6 +199,14 @@
"Lib/test/test_subprocess.py"))
(("/bin/sh") (which "sh")))
#t))
+ ,@(if (hurd-system?)
+ `((add-before 'build 'patch-regen-for-hurd
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libc (assoc-ref inputs "libc")))
+ (substitute* "Lib/plat-generic/regen"
+ (("/usr/include/") (string-append libc "/include/")))
+ #t))))
+ '())
(add-before 'configure 'do-not-record-configure-flags
(lambda* (#:key configure-flags #:allow-other-keys)
;; Remove configure flags from the installed '_sysconfigdata.py'