mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: libffi: Update to 3.3.
* gnu/packages/patches/libffi-3.2.1-complex-alpha.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/libffi.scm (libffi): Update to 3.3. [source](patches): Remove. * gnu/packages/python.scm (python-3.7)[arguments]: Remove workaround.
This commit is contained in:
parent
8aeac338a7
commit
5f1000d5d4
4 changed files with 4 additions and 47 deletions
|
@ -1066,7 +1066,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/libgnome-encoding.patch \
|
%D%/packages/patches/libgnome-encoding.patch \
|
||||||
%D%/packages/patches/libgnomeui-utf8.patch \
|
%D%/packages/patches/libgnomeui-utf8.patch \
|
||||||
%D%/packages/patches/libgpg-error-gawk-compat.patch \
|
%D%/packages/patches/libgpg-error-gawk-compat.patch \
|
||||||
%D%/packages/patches/libffi-3.2.1-complex-alpha.patch \
|
|
||||||
%D%/packages/patches/libjpeg-turbo-CVE-2019-2201.patch \
|
%D%/packages/patches/libjpeg-turbo-CVE-2019-2201.patch \
|
||||||
%D%/packages/patches/libjxr-fix-function-signature.patch \
|
%D%/packages/patches/libjxr-fix-function-signature.patch \
|
||||||
%D%/packages/patches/libjxr-fix-typos.patch \
|
%D%/packages/patches/libjxr-fix-typos.patch \
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
(define-public libffi
|
(define-public libffi
|
||||||
(package
|
(package
|
||||||
(name "libffi")
|
(name "libffi")
|
||||||
(version "3.2.1")
|
(version "3.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
|
@ -49,21 +49,12 @@
|
||||||
name "-" version ".tar.gz"))
|
name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh"))
|
"0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"))))
|
||||||
(patches (search-patches "libffi-3.2.1-complex-alpha.patch"))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(;; Prevent the build system from passing -march and -mtune to the
|
`(;; Prevent the build system from passing -march and -mtune to the
|
||||||
;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4".
|
;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4".
|
||||||
#:configure-flags '("--enable-portable-binary" "--without-gcc-arch")
|
#:configure-flags '("--enable-portable-binary" "--without-gcc-arch")))
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after 'install 'post-install
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(define out (assoc-ref outputs "out"))
|
|
||||||
(symlink (string-append out "/lib/libffi-3.2.1/include")
|
|
||||||
(string-append out "/include"))
|
|
||||||
#t)))))
|
|
||||||
(outputs '("out" "debug"))
|
(outputs '("out" "debug"))
|
||||||
(synopsis "Foreign function call interface library")
|
(synopsis "Foreign function call interface library")
|
||||||
(description
|
(description
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
The patch fixes build failure of form:
|
|
||||||
../src/alpha/osf.S:298:2: error: #error "osf.S out of sync with ffi.h"
|
|
||||||
Upstream fixed the bug in a more invasive way
|
|
||||||
but didn't have releases since 3.2.1.
|
|
||||||
|
|
||||||
The patch is taken from Gentoo:
|
|
||||||
https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
|
|
||||||
|
|
||||||
--- libffi-3.2.1/src/alpha/osf.S 2015-01-16 10:46:15.000000000 +0100
|
|
||||||
+++ libffi-3.2.1/src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100
|
|
||||||
@@ -279,6 +279,7 @@
|
|
||||||
.gprel32 $load_64 # FFI_TYPE_SINT64
|
|
||||||
.gprel32 $load_none # FFI_TYPE_STRUCT
|
|
||||||
.gprel32 $load_64 # FFI_TYPE_POINTER
|
|
||||||
+ .gprel32 $load_none # FFI_TYPE_COMPLEX
|
|
||||||
|
|
||||||
/* Assert that the table above is in sync with ffi.h. */
|
|
||||||
|
|
||||||
@@ -294,7 +295,8 @@
|
|
||||||
|| FFI_TYPE_SINT64 != 12 \
|
|
||||||
|| FFI_TYPE_STRUCT != 13 \
|
|
||||||
|| FFI_TYPE_POINTER != 14 \
|
|
||||||
- || FFI_TYPE_LAST != 14
|
|
||||||
+ || FFI_TYPE_COMPLEX != 15 \
|
|
||||||
+ || FFI_TYPE_LAST != 15
|
|
||||||
#error "osf.S out of sync with ffi.h"
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -377,12 +377,7 @@ data types.")
|
||||||
" --exclude test_mmap"
|
" --exclude test_mmap"
|
||||||
;; test_socket may hang and eventually run out of memory
|
;; test_socket may hang and eventually run out of memory
|
||||||
;; on some systems: <https://bugs.python.org/issue34587>.
|
;; on some systems: <https://bugs.python.org/issue34587>.
|
||||||
" test_socket"
|
" test_socket")))
|
||||||
;; XXX: test_ctypes fails on some platforms due to a problem in
|
|
||||||
;; libffi 3.2.1: <https://bugs.python.org/issue23249>.
|
|
||||||
,@(if (string-prefix? "aarch64" (%current-system))
|
|
||||||
'(" test_ctypes")
|
|
||||||
'()))))
|
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
`(modify-phases ,phases
|
`(modify-phases ,phases
|
||||||
(add-before 'check 'set-TZDIR
|
(add-before 'check 'set-TZDIR
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue