[Pkg-ocaml-maint-commits] [js-of-ocaml] 07/09: Fix generation of compiler.cm*

[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 8a7c5c76295e4d0d5fbe44ae287174495bd2592d
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 17 11:41:34 2014 +0200

    Fix generation of compiler.cm*
---
 .../0001-Fix-generation-of-compiler.cm.patch       | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 41 insertions(+)

diff --git a/debian/patches/0001-Fix-generation-of-compiler.cm.patch b/debian/patches/0001-Fix-generation-of-compiler.cm.patch
new file mode 100644
index 0000000..3d4b38f
--- /dev/null
+++ b/debian/patches/0001-Fix-generation-of-compiler.cm.patch
@@ -0,0 +1,40 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 17 Jun 2014 11:41:17 +0200
+Subject: Fix generation of compiler.cm*
+
+---
+ compiler/Makefile | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/compiler/Makefile b/compiler/Makefile
+index ba1675d..4d1b306 100644
+--- a/compiler/Makefile
++++ b/compiler/Makefile
+@@ -40,17 +40,23 @@ minify.opt: $(OBJS:cmx=cmx) minify.cmx
+ 	ocamlfind ocamlopt -package $(PACKAGES) -linkpkg -g -o $@ $^
+ 
+ 
+-compiler.cma: $(OBJS:cmx=cmo)
++compiler.cmo: $(OBJS:cmx=cmo)
+ 	ocamlfind ocamlc -pack -o $@ $^
+ 
++compiler.cma: compiler.cmo
++	ocamlfind ocamlc -a -o $@ $^
++
+ local/compiler.cma: compiler.cma
+ 	mkdir -p local
+ 	cp compiler.cma compiler.cmi local/
+ 
+-compiler.cmxa: $(OBJS)
++compiler.cmx: $(OBJS)
+ 	ocamlfind ocamlopt -pack -g -o $@ $^
+ 
+-compiler.cmxs: $(OBJS)
++compiler.cmxa: compiler.cmx
++	ocamlfind ocamlopt -a -o $@ $^
++
++compiler.cmxs: compiler.cmxa
+ 	ocamlfind ocamlopt -shared -g -o $@ $^
+ 
+ VERSION := $(shell head -n 1 ../VERSION)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a09c513
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-generation-of-compiler.cm.patch

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