This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository eliom.
commit cc2fd4cac7ea1b319f571b11592ff2a012603669
Author: Stephane Glondu <st...@glondu.net>
Date: Tue Jul 1 13:37:54 2014 +0200
Fix build on bytecode architectures
---
.../0003-Fix-build-on-bytecode-architectures.patch | 46 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 47 insertions(+)
diff --git a/debian/patches/0003-Fix-build-on-bytecode-architectures.patch
b/debian/patches/0003-Fix-build-on-bytecode-architectures.patch
new file mode 100644
index 0000000..ed7123d
--- /dev/null
+++ b/debian/patches/0003-Fix-build-on-bytecode-architectures.patch
@@ -0,0 +1,46 @@
+From: Stephane Glondu <st...@glondu.net>
+Date: Tue, 1 Jul 2014 13:37:44 +0200
+Subject: Fix build on bytecode architectures
+
+---
+ src/Makefile | 4 ++--
+ src/syntax/Makefile | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 55b7291..c611d5f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -15,7 +15,7 @@ byte: metas conf
+ ${MAKE} -C server byte
+ ${MAKE} -C client all
+ ${MAKE} -C tools all
+- ${MAKE} -C clientserver all
++ ${MAKE} -C clientserver byte
+ ${MAKE} -C server2 byte
+ ${MAKE} -C client2 all
+ ${MAKE} -C ocamlbuild $@
+@@ -114,7 +114,7 @@ install.META:
+ files/META
+
+ install.byte: install.META install.man
+- ${MAKE} -C clientserver install.byte
++ ${MAKE} -C clientserver install
+ ${MAKE} -C server install.byte
+ ${MAKE} -C client2 install
+ ${MAKE} -C server2 install.byte
+diff --git a/src/syntax/Makefile b/src/syntax/Makefile
+index 7cae934..7809ffe 100644
+--- a/src/syntax/Makefile
++++ b/src/syntax/Makefile
+@@ -20,8 +20,7 @@ FILES_OPT:= $(FILES:.ml=.cmx) $(FILES:.ml=.o)
$(FILES:.ml=.cmxs)
+ endif
+
+ all:
+- ${MAKE} $(FILES:.ml=.cmo)
+- ${MAKE} $(FILES_OPT)
++ ${MAKE} $(FILES:.ml=.cmo) $(FILES_OPT)
+
+ install:
+ ${INSTALL} -m 755 -d ${SYNTAXDIR}
+--
diff --git a/debian/patches/series b/debian/patches/series
index 0639e2b..3614a14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Fix-ocamldoc-invocation-in-src-server-client.patch
0002-Install-.o-files-with-.cmx-files.patch
+0003-Fix-build-on-bytecode-architectures.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/eliom.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
