diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
commit | 284fa7264963acc5d114ef5d54c347126b1654ba (patch) | |
tree | 3e5360fcc81b6d0dce76a65aca60cf8528f2931f /gnu/packages/patches/idris-test-ffi008.patch | |
parent | 12c9da35389dfba86ae0d863132a6b2c4374205a (diff) | |
parent | 882cacc1bb5be0df334dd7ce55b385a3a1678728 (diff) | |
download | guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/idris-test-ffi008.patch')
-rw-r--r-- | gnu/packages/patches/idris-test-ffi008.patch | 26 |
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); + } |