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

glondu pushed a commit to branch master
in repository ocamlnet.

commit 6c124cb22d62e525b35b052ca5abf723b96dce55
Author: Stephane Glondu <st...@glondu.net>
Date:   Thu Oct 15 13:47:55 2015 +0200

    Fix compilation of Apache module
---
 .../0006-Fix-compilation-of-Apache-module.patch    | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0006-Fix-compilation-of-Apache-module.patch 
b/debian/patches/0006-Fix-compilation-of-Apache-module.patch
new file mode 100644
index 0000000..3788560
--- /dev/null
+++ b/debian/patches/0006-Fix-compilation-of-Apache-module.patch
@@ -0,0 +1,26 @@
+From: Stephane Glondu <st...@glondu.net>
+Date: Thu, 15 Oct 2015 13:42:46 +0200
+Subject: Fix compilation of Apache module
+
+When ocamlc is called with -g option, it calls the C compiler with this
+option, which does not work when the compiler is apxs2.
+---
+ src/netcgi2-apache/Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/netcgi2-apache/Makefile b/src/netcgi2-apache/Makefile
+index 218fa7c..f5a782f 100644
+--- a/src/netcgi2-apache/Makefile
++++ b/src/netcgi2-apache/Makefile
+@@ -55,7 +55,9 @@ mod_netcgi_apache.so: $(MOD_OBJECTS)
+ 
+ netcgi_apache_mod.lo: netcgi_apache_mod.o
+       echo "$@ generated by the rule for $^"
+-netcgi_apache_mod.o: netcgi_apache_mod.ml
++netcgi_apache_mod.o: netcgi_apache_mod.c
++      $(APXS) -c -o $@ $^
++netcgi_apache_mod.c: netcgi_apache_mod.ml
+       $(OCAMLC) -verbose -output-obj -linkall -o $@ -cc $(APXS) \
+         dynlink.cma unix.cma findlib.cma $^
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index fe242fa..81c90fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Do-not-install-apache.info-file.patch
 0004-Force-major-version-for-apache-to-2.patch
 0005-Fix-upstream-cleaning-rules.patch
+0006-Fix-compilation-of-Apache-module.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.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

Reply via email to