summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2022-07-17 21:09:10 +1000
committerMark Wright <gienah@gentoo.org>2022-07-17 21:09:10 +1000
commit6c807fa38179efb2bfe09acf1a332c7bdf7fe0c0 (patch)
treeb8ac6e55f1dd01af951183490ad83ad105c8aa6f /dev-lang/teyjus/files/teyjus-2.1-p005-Unbundle-ocaml-header-files.patch
parentapp-accessibility/speechd-el: bump to 2.11 (diff)
downloadgentoo-6c807fa38179efb2bfe09acf1a332c7bdf7fe0c0.tar.gz
gentoo-6c807fa38179efb2bfe09acf1a332c7bdf7fe0c0.tar.bz2
gentoo-6c807fa38179efb2bfe09acf1a332c7bdf7fe0c0.zip
dev-lang/teyjus: Unbundle ocaml inc files, require ocaml[ocamlopt]
Fix 749996, unbundle old ocaml include files, and include the ocaml system include files. Fix 749996, remove the ocamlopt USE flag, and require dev-lang/ocaml[ocamlopt]. Fix 726890, edit source/OMakefile to set CFLAGS and LDFLAGS. Thanks to Toralf Forster and Agostino Sarubbo for reporting. See also: https://github.com/teyjus/teyjus/pull/126 Closes: https://bugs.gentoo.org/749996 Closes: https://bugs.gentoo.org/811210 Closes: https://bugs.gentoo.org/726890 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Mark Wright <gienah@gentoo.org>
Diffstat (limited to 'dev-lang/teyjus/files/teyjus-2.1-p005-Unbundle-ocaml-header-files.patch')
-rw-r--r--dev-lang/teyjus/files/teyjus-2.1-p005-Unbundle-ocaml-header-files.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/dev-lang/teyjus/files/teyjus-2.1-p005-Unbundle-ocaml-header-files.patch b/dev-lang/teyjus/files/teyjus-2.1-p005-Unbundle-ocaml-header-files.patch
new file mode 100644
index 000000000000..11351755e465
--- /dev/null
+++ b/dev-lang/teyjus/files/teyjus-2.1-p005-Unbundle-ocaml-header-files.patch
@@ -0,0 +1,44 @@
+commit 7371d8e75ce11c825a79614c44d70316759b16c3
+Author: Mark Wright <gienah@gentoo.org>
+Date: Sun Jul 17 20:08:37 2022 +1000
+
+ include ocaml system header files instead of old bundled ocaml header files
+
+diff --git a/source/front/ccode_stubs_c.c b/source/front/ccode_stubs_c.c
+index f1a62a7..f5f9042 100644
+--- a/source/front/ccode_stubs_c.c
++++ b/source/front/ccode_stubs_c.c
+@@ -21,10 +21,10 @@
+ #include "../simulator/builtins/readterm.h"
+ #include "front_c.h"
+ #include "query_c.h"
+-#include "caml/mlvalues.h"
+-#include "caml/memory.h"
+-#include "caml/alloc.h"
+-#include "caml/custom.h"
++#include <caml/mlvalues.h>
++#include <caml/memory.h>
++#include <caml/alloc.h>
++#include <caml/custom.h>
+
+ /***************************************************************************/
+ /* front */
+diff --git a/source/front/linker_c.c b/source/front/linker_c.c
+index d9cb1bc..0c173cd 100644
+--- a/source/front/linker_c.c
++++ b/source/front/linker_c.c
+@@ -20,10 +20,10 @@
+
+ #include "../linker/module.h"
+ #include "../linker/linker_message.h"
+-#include "caml/mlvalues.h"
+-#include "caml/memory.h"
+-#include "caml/alloc.h"
+-#include "caml/custom.h"
++#include <caml/mlvalues.h>
++#include <caml/memory.h>
++#include <caml/alloc.h>
++#include <caml/custom.h>
+
+ value FRONT_link(value mod_str, value verb)
+ {