unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 5b7095bfd4590ab0def6818efa1f670ae4d4b0d5 961 bytes (raw)
name: gnu/packages/patches/libffi-3.2.1-complex_alpha.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
 
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.orig	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
 

debug log:

solving 5b7095bfd ...
found 5b7095bfd in https://yhetil.org/guix-patches/20170412215944.3fa356d1@sf/

applying [1/1] https://yhetil.org/guix-patches/20170412215944.3fa356d1@sf/
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 000000000..5b7095bfd

1:17: space before tab in indent.
 	.gprel32 $load_64	# FFI_TYPE_SINT64
1:18: space before tab in indent.
 	.gprel32 $load_none	# FFI_TYPE_STRUCT
1:19: space before tab in indent.
 	.gprel32 $load_64	# FFI_TYPE_POINTER
1:21: trailing whitespace.
 
1:23: trailing whitespace.
 
Checking patch gnu/packages/patches/libffi-3.2.1-complex_alpha.patch...
Applied patch gnu/packages/patches/libffi-3.2.1-complex_alpha.patch cleanly.
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.

index at:
100644 5b7095bfd4590ab0def6818efa1f670ae4d4b0d5	gnu/packages/patches/libffi-3.2.1-complex_alpha.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).