[Pkg-ocaml-maint-commits] [SCM] bin-prot packaging branch, master, updated. debian/1.2.24-1-17-ga2c5a54

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 9dbdd60a85ce5c0ae5e825d1b0d99f2d3abde4e4
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 13 09:29:17 2011 +0200

    Use cpp as default preprocessor on unknown OS

diff --git a/debian/patches/0002-Use-cpp-as-default-preprocessor-on-unknown-OS.patch b/debian/patches/0002-Use-cpp-as-default-preprocessor-on-unknown-OS.patch
new file mode 100644
index 0000000..0e66cf0
--- /dev/null
+++ b/debian/patches/0002-Use-cpp-as-default-preprocessor-on-unknown-OS.patch
@@ -0,0 +1,29 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 13 Jul 2011 09:22:50 +0200
+Subject: Use cpp as default preprocessor on unknown OS
+
+One could also add "GNU" (Hurd) and "GNU/kFreeBSD" as cases handled
+the same way as Linux (but they are probably not the only ones). This
+should be fix FTBFS on Debian's hurd-any and kfreebsd-any.
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631829
+---
+ myocamlbuild.ml |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/myocamlbuild.ml b/myocamlbuild.ml
+index 7f9d7ea..0f1653d 100644
+--- a/myocamlbuild.ml
++++ b/myocamlbuild.ml
+@@ -469,9 +469,8 @@ let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
+ let cpp =
+   let base_cpp =
+     match Ocamlbuild_pack.My_unix.run_and_open "uname -s" input_line with
+-    | "Linux" -> "cpp"
+     | "Darwin" -> "cc -E -x c -w"
+-    | s -> failwith ("unknow os: " ^ s)
++    | _ -> "cpp"
+   in
+   match Sys.word_size with
+   | 64 -> S [A"-pp"; P(base_cpp ^" -DARCH_SIXTYFOUR")]
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 0b8bff1..2788b22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-bigstring-layout-bug.patch
+0002-Use-cpp-as-default-preprocessor-on-unknown-OS.patch

-- 
bin-prot packaging