diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-10-26 14:14:01 +0100 |
|---|---|---|
| committer | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-10-26 15:39:40 +0100 |
| commit | 5319f716cf575321bef4c501d7aebdc7220d69cf (patch) | |
| tree | 06bd990ee6589491fd3651fc4d497f61de1223d1 /gnu/packages/python.scm | |
| parent | b2dc7cb8f91d904e4d9530de84c3a846e5262e80 (diff) | |
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.
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3414ad959b1..62494bea200 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm | |||
| @@ -373,7 +373,8 @@ data types.") | |||
| 373 | "python-3-fix-tests.patch" | 373 | "python-3-fix-tests.patch" |
| 374 | "python-3.8-fix-tests.patch" | 374 | "python-3.8-fix-tests.patch" |
| 375 | "python-3-deterministic-build-info.patch" | 375 | "python-3-deterministic-build-info.patch" |
| 376 | "python-3-search-paths.patch")) | 376 | "python-3-search-paths.patch" |
| 377 | "python-3-hurd-configure.patch")) | ||
| 377 | (sha256 | 378 | (sha256 |
| 378 | (base32 | 379 | (base32 |
| 379 | "1c43dbv9lvlp3ynqmgdi4rh8q94swanhqarqrdx62zmigpakw073")) | 380 | "1c43dbv9lvlp3ynqmgdi4rh8q94swanhqarqrdx62zmigpakw073")) |
| @@ -401,17 +402,6 @@ data types.") | |||
| 401 | ,@(if (hurd-system?) | 402 | ,@(if (hurd-system?) |
| 402 | `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9 | 403 | `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9 |
| 403 | '()) | 404 | '()) |
| 404 | ,@(if (hurd-target?) | ||
| 405 | ;; The build system refuses to cross-compile for unknown targets | ||
| 406 | ;; even though it works fine. Add GNU/Hurd target. | ||
| 407 | ;; TODO: Make it a patch in a future rebuild cycle. | ||
| 408 | '((add-before 'configure 'support-hurd-cross-compile | ||
| 409 | (lambda _ | ||
| 410 | (substitute* "configure" | ||
| 411 | (("\\*-\\*-vxworks.*" all) | ||
| 412 | (string-append "*-*-gnu)\nac_sys_system=GNU\n;;\n" all))) | ||
| 413 | #t))) | ||
| 414 | '()) | ||
| 415 | (add-before 'check 'set-TZDIR | 405 | (add-before 'check 'set-TZDIR |
| 416 | (lambda* (#:key inputs native-inputs #:allow-other-keys) | 406 | (lambda* (#:key inputs native-inputs #:allow-other-keys) |
| 417 | ;; test_email requires the Olson time zone database. | 407 | ;; test_email requires the Olson time zone database. |
