[Pkg-ocaml-maint-commits] [js-of-ocaml] 01/02: Fix FTBFS on bytecode architectures

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository js-of-ocaml.

commit 49d3bd40c5ab0d611c535b9f189b446c0a840dc6
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 18 11:15:30 2014 +0200

    Fix FTBFS on bytecode architectures
---
 debian/libjs-of-ocaml-dev.install.in            |  2 +-
 debian/patches/0002-Bytecode-only-support.patch | 22 ++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/libjs-of-ocaml-dev.install.in b/debian/libjs-of-ocaml-dev.install.in
index e323670..d5de450 100644
--- a/debian/libjs-of-ocaml-dev.install.in
+++ b/debian/libjs-of-ocaml-dev.install.in
@@ -11,4 +11,4 @@ OPT: lib/syntax/pa_js.o @OCamlStdlibDir@/js_of_ocaml
 OPT: lib/syntax/pa_deriving_Json.o @OCamlStdlibDir@/js_of_ocaml
 DYN: @OCamlStdlibDir@/js_of_ocaml/pa_*.cmxs
 DYN: @OCamlStdlibDir@/js_of_ocaml/ocamlbuild_js_of_ocaml.cmxs
-compiler/compiler.a @OCamlStdlibDir@/js_of_ocaml
+OPT: compiler/compiler.a @OCamlStdlibDir@/js_of_ocaml
diff --git a/debian/patches/0002-Bytecode-only-support.patch b/debian/patches/0002-Bytecode-only-support.patch
new file mode 100644
index 0000000..2c5a6ad
--- /dev/null
+++ b/debian/patches/0002-Bytecode-only-support.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 18 Jun 2014 11:14:55 +0200
+Subject: Bytecode-only support
+
+---
+ compiler/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compiler/Makefile b/compiler/Makefile
+index 4d1b306..539b902 100644
+--- a/compiler/Makefile
++++ b/compiler/Makefile
+@@ -3,7 +3,7 @@ include ../Makefile.conf
+ 
+ all: $(COMPILER) $(MINIFIER)
+ 
+-lib: compiler.cma compiler.cmxa compiler.cmxs
++lib: compiler.cma $(if $(wildcard /usr/bin/ocamlopt),compiler.cmxa) $(if $(wildcard /usr/lib/ocaml/dynlink.cmxa),compiler.cmxs)
+ 
+ PACKAGES=findlib
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a09c513..8e24fcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-generation-of-compiler.cm.patch
+0002-Bytecode-only-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/js-of-ocaml.git