[Pkg-ocaml-maint-commits] [eliom] 01/02: Fix compilation 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 eliom.

commit 417e607fb037e3a6665e9949cb38b408ebfcec09
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jan 22 14:39:42 2016 +0100

    Fix compilation on bytecode architectures
---
 ...Fix-compilation-on-bytecode-architectures.patch | 62 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 63 insertions(+)

diff --git a/debian/patches/0001-Fix-compilation-on-bytecode-architectures.patch b/debian/patches/0001-Fix-compilation-on-bytecode-architectures.patch
new file mode 100644
index 0000000..70ead47
--- /dev/null
+++ b/debian/patches/0001-Fix-compilation-on-bytecode-architectures.patch
@@ -0,0 +1,62 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 22 Jan 2016 14:39:00 +0100
+Subject: Fix compilation on bytecode architectures
+
+---
+ Makefile     | 6 ++++--
+ README.build | 2 +-
+ pkg/build.ml | 2 +-
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 86cd291..c342cbc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,17 +1,19 @@
+ ### Building
+-BUILDER=_build/build/build.native
++BUILDER=_build/build/build.byte
+ BUILD=ocaml pkg/build.ml
+ 
+ .PHONY: all byte opt builder
+ all: $(BUILDER)
+ 	$(BUILD) manpage=false native=true native-dynlink=true
+ byte: $(BUILDER)
++	# strange, see https://sympa.inria.fr/sympa/arc/ocsigen/2016-01/msg00016.html
++	$(BUILDER) src/lib/server/eliommod_sessiongroups.cmi
+ 	$(BUILD) manpage=false native=false native-dynlink=false
+ opt: $(BUILDER)
+ 	$(BUILD) manpage=false native=true native-dynlink=true
+ 
+ $(BUILDER): $(wildcard build/*.ml)
+-	ocamlbuild -no-plugin -I src/ocamlbuild -no-links -use-ocamlfind build/build.native 1> /dev/null
++	ocamlbuild -no-plugin -I src/ocamlbuild -no-links -use-ocamlfind build/build.byte 1> /dev/null
+ builder: $(BUILDER)
+ ### Doc
+ .PHONY: doc wikidoc doc man alldoc
+diff --git a/README.build b/README.build
+index 9769d75..a382c05 100644
+--- a/README.build
++++ b/README.build
+@@ -1,6 +1,6 @@
+ == internal description of compilation/installation steps
+ 
+- 1 - build custom ocamlbuild (build/build.native)
++ 1 - build custom ocamlbuild (build/build.byte)
+      this custom ocamlbuld uses src/ocamlbuild/ocamlbuild_eliom.ml to
+      avoid duplication
+ 
+diff --git a/pkg/build.ml b/pkg/build.ml
+index 6072b6c..7b01139 100755
+--- a/pkg/build.ml
++++ b/pkg/build.ml
+@@ -36,7 +36,7 @@ let nothing =
+   then "-nothing-should-be-rebuilt"
+   else ""
+ 
+-let builder = `Other ("_build/build/build.native","_build")
++let builder = `Other ("_build/build/build.byte","_build")
+ 
+ let with_man3 = Env.bool "manpage"
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3fc02dd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-compilation-on-bytecode-architectures.patch

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