mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
gnu: python: Move Hurd-specific configure fix into a patch.
* 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:
parent
b2dc7cb8f9
commit
5319f716cf
2 changed files with 3 additions and 12 deletions
|
@ -1483,6 +1483,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-3-search-paths.patch \
|
||||
%D%/packages/patches/python-3-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-aiohttp-3.6.2-no-warning-fail.patch \
|
||||
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
|
||||
|
|
|
@ -373,7 +373,8 @@ (define-public python-3.8
|
|||
"python-3-fix-tests.patch"
|
||||
"python-3.8-fix-tests.patch"
|
||||
"python-3-deterministic-build-info.patch"
|
||||
"python-3-search-paths.patch"))
|
||||
"python-3-search-paths.patch"
|
||||
"python-3-hurd-configure.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1c43dbv9lvlp3ynqmgdi4rh8q94swanhqarqrdx62zmigpakw073"))
|
||||
|
@ -401,17 +402,6 @@ (define-public python-3.8
|
|||
,@(if (hurd-system?)
|
||||
`((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
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
;; test_email requires the Olson time zone database.
|
||||
|
|
Loading…
Reference in a new issue