summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-04-01 23:50:21 +0200
committerAlexis Ballier <aballier@gentoo.org>2017-04-02 10:38:03 +0200
commita94a3df89153fa514be328be032071c2d41545e7 (patch)
tree352d730983e11dc1d1770de21af016929f3436fc /dev-ml/js_of_ocaml
parentdev-ml/js_of_ocaml: Drop async support, will be readded with dev-ml/async_js. (diff)
downloadgentoo-a94a3df89153fa514be328be032071c2d41545e7.tar.gz
gentoo-a94a3df89153fa514be328be032071c2d41545e7.tar.bz2
gentoo-a94a3df89153fa514be328be032071c2d41545e7.zip
dev-ml/js_of_ocaml: Fix build with latest ppx tools.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'dev-ml/js_of_ocaml')
-rw-r--r--dev-ml/js_of_ocaml/files/ppx.patch11
-rw-r--r--dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild4
2 files changed, 15 insertions, 0 deletions
diff --git a/dev-ml/js_of_ocaml/files/ppx.patch b/dev-ml/js_of_ocaml/files/ppx.patch
new file mode 100644
index 000000000000..c46293f546da
--- /dev/null
+++ b/dev-ml/js_of_ocaml/files/ppx.patch
@@ -0,0 +1,11 @@
+Index: js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
+===================================================================
+--- js_of_ocaml-2.8.4.orig/lib/ppx_driver/ppx_js_driver.ml
++++ js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
+@@ -1,5 +1,5 @@
+ let () =
+ let js_mapper = Ppx_js.js_mapper [] in
+- Ppx_driver.register_transformation "js_of_ocaml"
++ Ppx_driver.register_transformation_using_ocaml_current_ast "js_of_ocaml"
+ ~impl:(js_mapper.Ast_mapper.structure js_mapper)
+ ~intf:(js_mapper.Ast_mapper.signature js_mapper)
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild
index a68da44990b4..11d4b7ce0093 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild
@@ -40,6 +40,10 @@ RDEPEND="
deriving? ( >=dev-ml/deriving-0.6:= )"
DEPEND="${RDEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/ppx.patch"
+}
+
src_configure() {
printf "\n\n" >> Makefile.conf
use ocamlopt || echo "BEST := byte" >> Makefile.conf