aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/libffi-3.2.1-complex-alpha.patch
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@inbox.ru>2017-03-06 22:21:43 +0000
committerLudovic Courtès <ludo@gnu.org>2017-04-13 14:44:27 +0200
commitdc4ebebd61896b1122fde97644325d06e3f46b47 (patch)
tree4133f59b81ebe7fabc34ec3f12fd1ed3fcf1b390 /gnu/packages/patches/libffi-3.2.1-complex-alpha.patch
parentbd54c5e3faa9fc46b00428be2f7a5e16afc64f5e (diff)
downloadgnu-guix-dc4ebebd61896b1122fde97644325d06e3f46b47.tar
gnu-guix-dc4ebebd61896b1122fde97644325d06e3f46b47.tar.gz
gnu: libffi: Fix builds on Alpha.
* gnu/packages/patches/libffi-3.2.1-complex_alpha.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/libffi.scm (libffi)[source]: Use it. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patches/libffi-3.2.1-complex-alpha.patch')
-rw-r--r--gnu/packages/patches/libffi-3.2.1-complex-alpha.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/libffi-3.2.1-complex-alpha.patch b/gnu/packages/patches/libffi-3.2.1-complex-alpha.patch
new file mode 100644
index 0000000000..ebbc0635a5
--- /dev/null
+++ b/gnu/packages/patches/libffi-3.2.1-complex-alpha.patch
@@ -0,0 +1,28 @@
+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
+