diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-08-05 15:45:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-08-05 15:46:46 +0200 |
| commit | 058b339d31dd0553f6736920a0dad68660728113 (patch) | |
| tree | 4f2a6fa4647bd9206ddd4eeaacd3dc5713e7a948 /gnu/packages | |
| parent | cfc1d13346649afedb94c885470e43139a9dbcdd (diff) | |
| download | guix-058b339d31dd0553f6736920a0dad68660728113.tar.gz | |
gnu: ocaml@4.09: Fix link failure.
* gnu/packages/patches/ocaml-4.09-multiple-definitions.patch: New file. * gnu/packages/ocaml.scm (ocaml-4.09)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/ocaml.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/ocaml-4.09-multiple-definitions.patch | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e9c1fd71e8..73ff9abb7b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -254,6 +254,7 @@ functional, imperative and object-oriented styles of programming.") "http://caml.inria.fr/pub/distrib/ocaml-" (version-major+minor version) "/ocaml-" version ".tar.xz")) + (patches (search-patches "ocaml-4.09-multiple-definitions.patch")) (sha256 (base32 "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))))) diff --git a/gnu/packages/patches/ocaml-4.09-multiple-definitions.patch b/gnu/packages/patches/ocaml-4.09-multiple-definitions.patch new file mode 100644 index 0000000000..b2661f822c --- /dev/null +++ b/gnu/packages/patches/ocaml-4.09-multiple-definitions.patch @@ -0,0 +1,41 @@ +Avoid multiply-defined symbols that lead to link errors such as: + + ld: libcamlrund.a(backtrace_bd.o):/tmp/guix-build-ocaml-4.09.0.drv-0/ocaml-4.09.0/runtime/backtrace.c:31: multiple definition of `caml_debug_info'; libcamlrund.a(backtrace_byt_bd.o):/tmp/guix-build-ocaml-4.09.0.drv-0/ocaml-4.09.0/runtime/backtrace_byt.c:47: first defined here + +diff --git a/runtime/backtrace.c b/runtime/backtrace.c +index a3c2c08..f57c81c 100644 +--- a/runtime/backtrace.c ++++ b/runtime/backtrace.c +@@ -28,7 +28,7 @@ + #include "caml/fail.h" + + /* The table of debug information fragments */ +-struct ext_table caml_debug_info; ++static struct ext_table caml_debug_info; + + CAMLexport int32_t caml_backtrace_active = 0; + CAMLexport int32_t caml_backtrace_pos = 0; +diff --git a/runtime/backtrace_byt.c b/runtime/backtrace_byt.c +index b913dac..b5ec926 100644 +--- a/runtime/backtrace_byt.c ++++ b/runtime/backtrace_byt.c +@@ -44,7 +44,7 @@ + #include "caml/backtrace_prim.h" + + /* The table of debug information fragments */ +-struct ext_table caml_debug_info; ++static struct ext_table caml_debug_info; + + CAMLexport char_os * caml_cds_file = NULL; + +diff --git a/runtime/startup_nat.c b/runtime/startup_nat.c +index b4e6bc4..7eca5fa 100644 +--- a/runtime/startup_nat.c ++++ b/runtime/startup_nat.c +@@ -44,6 +44,5 @@ + #endif + + extern int caml_parser_trace; +-CAMLexport header_t caml_atom_table[256]; + char * caml_code_area_start, * caml_code_area_end; + struct ext_table caml_code_fragments_table; |