diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-02-05 09:38:23 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-02-05 09:38:58 +0000 |
| commit | 3e396d2b57d76c1025491c8313859e59778f65e8 (patch) | |
| tree | d35862920da5dd49c8396def2ae8ead66d80fe26 /dev-lang/ocaml | |
| parent | app-text/gspell: remove old (diff) | |
| download | gentoo-3e396d2b57d76c1025491c8313859e59778f65e8.tar.gz gentoo-3e396d2b57d76c1025491c8313859e59778f65e8.tar.bz2 gentoo-3e396d2b57d76c1025491c8313859e59778f65e8.zip | |
dev-lang/ocaml: tweak for gcc-10
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-lang/ocaml')
| -rw-r--r-- | dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch | 21 | ||||
| -rw-r--r-- | dev-lang/ocaml/ocaml-4.09.0.ebuild | 4 |
2 files changed, 24 insertions, 1 deletions
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch b/dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch new file mode 100644 index 000000000000..e25d55a5f668 --- /dev/null +++ b/dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch @@ -0,0 +1,21 @@ +--- 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; ++extern struct ext_table caml_debug_info; + + CAMLexport int32_t caml_backtrace_active = 0; + CAMLexport int32_t caml_backtrace_pos = 0; +--- a/runtime/startup_nat.c ++++ b/runtime/startup_nat.c +@@ -44,7 +44,6 @@ + #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; + diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild b/dev-lang/ocaml/ocaml-4.09.0.ebuild index c39cc2aee83d..5fb59fc6617a 100644 --- a/dev-lang/ocaml/ocaml-4.09.0.ebuild +++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,6 +19,8 @@ BDEPEND="${RDEPEND} PDEPEND="emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )" +PATCHES=("${FILESDIR}"/${PN}-4.09.0-gcc-10.patch) + src_prepare() { default # Upstream build ignores LDFLAGS in several places. |