summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorEric Bavier <bavier@posteo.net>2022-04-13 09:45:34 -0500
committerEric Bavier <bavier@posteo.net>2022-04-13 09:48:04 -0500
commitb5e32d96202e58bb0e7d640fe54f728d0ca2b4b1 (patch)
treebfbf71bbdb1b4d07c12ca016cedc875cde6ca391 /gnu/packages/patches
parent8d82d817bc609d128ba9af694503deecd2348c08 (diff)
downloadguix-b5e32d96202e58bb0e7d640fe54f728d0ca2b4b1.tar.gz
gnu: idris: Fixes test failure.
* gnu/packages/patches/idris-test-ffi008.patch: New file.
* gnu/packages/idris.scm (source): Use it.
* gnu/local.mk (dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/idris-test-ffi008.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/idris-test-ffi008.patch b/gnu/packages/patches/idris-test-ffi008.patch
new file mode 100644
index 0000000000..530813c20e
--- /dev/null
+++ b/gnu/packages/patches/idris-test-ffi008.patch
@@ -0,0 +1,26 @@
+Avoid "multiple definition of `mystruct'" error from `ld`:
+
+Submitted upstream at https://github.com/idris-lang/Idris-dev/issues/4914
+
+--- a/test/ffi008/ffi008.h	1969-12-31 18:00:01.000000000 -0600
++++ a/test/ffi008/ffi008.h	2022-04-13 00:32:35.561262598 -0500
+@@ -10,7 +10,7 @@
+     int16_t b;
+ };
+ 
+-struct test2 mystruct;
++extern struct test2 mystruct;
+ 
+ int size1(void);
+ int size2(void);
+--- a/test/ffi008/ffi008.c	1969-12-31 18:00:01.000000000 -0600
++++ a/test/ffi008/ffi008.c	2022-04-13 00:32:53.145186302 -0500
+@@ -11,6 +11,8 @@
+     return sizeof(struct test2);
+ }
+ 
++struct test2 mystruct;
++
+ void print_mystruct(void) {
+     printf("a: %d b: %d\n", mystruct.a, mystruct.b);
+ }