[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: gnu: python: Move Hurd-specific configure fix into a patch.
From: |
guix-commits |
Subject: |
05/05: gnu: python: Move Hurd-specific configure fix into a patch. |
Date: |
Mon, 26 Oct 2020 10:40:45 -0400 (EDT) |
janneke pushed a commit to branch core-updates
in repository guix.
commit 5319f716cf575321bef4c501d7aebdc7220d69cf
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon Oct 26 14:14:01 2020 +0100
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.
---
gnu/local.mk | 1 +
gnu/packages/python.scm | 14 ++------------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 922c1c5..2ccea6f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -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 \
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3414ad9..62494be 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -373,7 +373,8 @@ data types.")
"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 @@ data types.")
,@(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.