futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: python: Build fix for the Hurd.

Browse Source 
* gnu/packages/python.scm (python-2.7)[arguments]: Add `fix-regen'
stage to correct a reference to "/usr".
(python-3.8): Remove build fix for 2.x..3.5.9 that breaks on 3.8.2.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-04-13 07:47:38 +02:00 committed by Jan Nieuwenhuizen
parent 0e907e27ed
commit 189bfb555d
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/python.scm
View File

@ -58,6 +58,7 @@
;;; Copyright © 2018 Luther Thompson <lutheroto@gmail.com> ;;; Copyright © 2018 Luther Thompson <lutheroto@gmail.com>
;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -81,6 +82,7 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages dbm) #:use-module (gnu packages dbm)
#:use-module (gnu packages hurd)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
@ -197,6 +199,14 @@
"Lib/test/test_subprocess.py")) "Lib/test/test_subprocess.py"))
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
#t)) #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 (add-before 'configure 'do-not-record-configure-flags
(lambda* (#:key configure-flags #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)
;; Remove configure flags from the installed '_sysconfigdata.py' ;; Remove configure flags from the installed '_sysconfigdata.py'
@ -383,7 +393,9 @@ data types.")
" test_socket"))) " test_socket")))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
,@(if (hurd-system?)
`((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9
'())
(add-before 'check 'set-TZDIR (add-before 'check 'set-TZDIR
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
;; test_email requires the Olson time zone database. ;; test_email requires the Olson time zone database.