ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 06:06:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Python: Move arm-alignment.patch to a native-input + phase.

Browse source 
This follows up 67ca82e6dd which was ineffective
when running 'guix build --system=armhf-linux python' on e.g. x86_64-linux
because the conditional would always return the native system.

* gnu/packages/python.scm (python-3.8)[native-inputs]: Add "arm-alignment.patch".
[arguments]: Add phase to apply it.
[source](patches): Remove it.
* gnu/packages/commencement.scm (python-boot0): Prevent inheriting the phase.
This commit is contained in:
Marius Bakke 2020-04-02 17:11:17 +02:00
parent 67ca82e6dd
commit 3cff86db8a
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/commencement.scm
View file

@ -3182,7 +3182,17 @@ (define python-boot0
;; Python package won't interfere with this one.
((#:make-flags _ ''()) ''())
((#:phases phases)
`(modify-phases ,phases
;; Remove the 'apply-alignment-patch' phase if present to avoid
;; rebuilding this package. TODO: for the next rebuild cycle,
;; consider inlining all the arguments instead of inheriting to
;; make it easier to patch Python without risking a full rebuild.
;; Or better yet, change to 'python-on-guile'.
`(modify-phases ,@(list (match phases
(('modify-phases original-phases
changes ...
('add-after unpack apply-alignment-patch _))
`(modify-phases ,original-phases ,@changes))
(_ phases)))
(add-before 'configure 'disable-modules
(lambda _
(substitute* "setup.py"

48
gnu/packages/python.scm
View file

@ -354,22 +354,11 @@ (define-public python-3.8
(method url-fetch)
(uri (string-append "https://www.python.org/ftp/python/"
version "/Python-" version ".tar.xz"))
(patches (append
;; Disable unaligned accesses in the sha3 module on ARM as
;; it causes a test failure when building 32-bit Python on a
;; 64-bit kernel. See <https://bugs.python.org/issue36515>.
;; TODO: Remove the conditional on the next rebuild cycle.
(let ((system (or (%current-target-system)
(%current-system))))
(if (any (cute string-prefix? <> system)
'("arm" "aarch64"))
(list (search-patch "python-3-arm-alignment.patch"))
'()))
(search-patches
"python-3-fix-tests.patch"
"python-3.8-fix-tests.patch"
"python-3-deterministic-build-info.patch"
"python-3-search-paths.patch")))
(patches (search-patches
"python-3-fix-tests.patch"
"python-3.8-fix-tests.patch"
"python-3-deterministic-build-info.patch"
"python-3-search-paths.patch"))
(sha256
(base32
"1ps5v323cp5czfshqjmbsqw7nvrdpcbk06f62jbzaqik4gfffii6"))
@ -394,6 +383,7 @@ (define-public python-3.8
" test_socket")))
((#:phases phases)
`(modify-phases ,phases
(add-before 'check 'set-TZDIR
(lambda* (#:key inputs native-inputs #:allow-other-keys)
;; test_email requires the Olson time zone database.
@ -432,9 +422,33 @@ (define-public python-3.8
,file)))
(find-files out "\\.py$")))
(list '() '("-O") '("-OO")))
#t)))))))
#t)))
;; XXX: Apply patch on ARM platforms only to avoid a full rebuild.
;; Remove this phase in the next rebuild cycle.
,@(let ((system (or (%current-target-system)
(%current-system))))
(if (any (cute string-prefix? <> system)
'("arm" "aarch64"))
'((add-after 'unpack 'apply-alignment-patch
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(invoke "patch" "-p1" "--force" "--input"
(assoc-ref (or native-inputs inputs)
"arm-alignment.patch")))))
'()))))))
(native-inputs
`(("tzdata" ,tzdata-for-tests)
;; Disable unaligned accesses in the sha3 module on ARM as
;; it causes a test failure when building 32-bit Python on a
;; 64-bit kernel. See <https://bugs.python.org/issue36515>.
;; TODO: make this a regular patch in the next rebuild cycle.
,@(let ((system (or (%current-target-system)
(%current-system))))
(if (any (cute string-prefix? <> system)
'("arm" "aarch64"))
`(("arm-alignment.patch" ,(search-patch "python-3-arm-alignment.patch")))
'()))
,@(if (%current-target-system)
`(("python3" ,this-package))
'())