me/guix
Archived
1
0
Fork 0
Code Activity

gnu: python: Move Hurd-specific configure fix into a patch.

Browse source 
* gnu/packages/patches/python-3-configure-hurd.patch: this New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/python.scm (python-3.8)[source]: Use it.
[arguments]: Remove "support-hurd-cross-compile" stage.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-10-26 14:14:01 +01:00
parent b2dc7cb8f9
commit 5319f716cf
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1483,6 +1483,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-search-paths.patch \
%D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3.8-fix-tests.patch \ %D%/packages/patches/python-3.8-fix-tests.patch \
%D%/packages/patches/python-3-hurd-configure.patch \
%D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \
%D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \ %D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \

14
gnu/packages/python.scm
View file

@ -373,7 +373,8 @@ data types.")
"python-3-fix-tests.patch" "python-3-fix-tests.patch"
"python-3.8-fix-tests.patch" "python-3.8-fix-tests.patch"
"python-3-deterministic-build-info.patch" "python-3-deterministic-build-info.patch"
"python-3-search-paths.patch")) "python-3-search-paths.patch"
"python-3-hurd-configure.patch"))
(sha256 (sha256
(base32 (base32
"1c43dbv9lvlp3ynqmgdi4rh8q94swanhqarqrdx62zmigpakw073")) "1c43dbv9lvlp3ynqmgdi4rh8q94swanhqarqrdx62zmigpakw073"))
@ -401,17 +402,6 @@ data types.")
,@(if (hurd-system?) ,@(if (hurd-system?)
`((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9 `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9
'()) '())
,@(if (hurd-target?)
;; The build system refuses to cross-compile for unknown targets
;; even though it works fine. Add GNU/Hurd target.
;; TODO: Make it a patch in a future rebuild cycle.
'((add-before 'configure 'support-hurd-cross-compile
(lambda _
(substitute* "configure"
(("\\*-\\*-vxworks.*" all)
(string-append "*-*-gnu)\nac_sys_system=GNU\n;;\n" all)))
#t)))
'())
(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.