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

gnu: python-3.8: Apply python-3-arm-alignment.patch unconditionally.

Browse source 
* gnu/packages/python.scm (python-3.8)[source]: Add
"python-3-arm-alignment.patch" to the patches field.
[phases]{apply-alignment-patch}: Remove phase.
[native-inputs]: Remove arm-alignment.patch.
This commit is contained in:
Maxim Cournoyer 2020-10-21 22:27:30 -04:00
parent 44b0ffcf00
commit f1eea19c9a
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/python.scm
View file

@ -371,6 +371,7 @@ (define-public python-3.8
(uri (string-append "https://www.python.org/ftp/python/" (uri (string-append "https://www.python.org/ftp/python/"
version "/Python-" version ".tar.xz")) version "/Python-" version ".tar.xz"))
(patches (search-patches (patches (search-patches
"python-3-arm-alignment.patch"
"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"
@ -473,33 +474,9 @@ (define-public python-3.8
,file))) ,file)))
(find-files out "\\.py$"))) (find-files out "\\.py$")))
(list '() '("-O") '("-OO"))) (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 (native-inputs
`(("tzdata" ,tzdata-for-tests) `(("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) ,@(if (%current-target-system)
`(("python3" ,this-package)) `(("python3" ,this-package))
'()) '())