[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.12.0+debian2-1-g882d8de

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 882d8de358caec7c2e2d59388c7a8cd2205e18c6
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed Apr 6 11:53:57 2011 -0500

    Fixed camlp4 information..

diff --git a/debian/README.Debian b/debian/README.Debian
index 739bbb8..d8ed55a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -18,12 +18,6 @@ OCAMLFIND_CONF to /etc/i586-mingw32msvc-ocamlfind.conf:
   
   export OCAMLFIND_CONF=/etc/i586-mingw32msvc-ocamlfind.conf
 
-In order to also force the build system to choose the 
-ocaml cross-compiler, you may add /usr/i586-mingw32msvc/bin 
-at the beginning of the PATH variable:
-
-  export PATH=/usr/i586-mingw32msvc/bin:$PATH
-
 Eventually, when the build system uses the autoconf tool, 
 you can build the C libraries with the following options:
   ./configure --prefix=/usr/i586-mingw32msvc --host=i586-mingw32msvc
@@ -43,4 +37,4 @@ supported by the OCaml original maintainers. For any issue
 with this package, please report a bug on the mingw32-ocaml
 Debian package.
 
- -- Romain Beauxis <toots at rastageeks.org>  Wed, 06 Jan 2010 22:13:02 +0100
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 04 Apr 2011 11:36:30 -0500
diff --git a/debian/changelog b/debian/changelog
index 6349c71..cd12f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mingw32-ocaml (3.12.0+debian3) unstable; urgency=low
+
+  * Removed dirty suggestion to override PATH
+    to force detection of cross-compiler tools
+    in README.Debian
+  * Fixed camlp4 META file. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Tue, 05 Apr 2011 11:58:57 -0500
+
 mingw32-ocaml (3.12.0+debian2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/patches/findlib-fix-camlp4.patch b/debian/patches/findlib-fix-camlp4.patch
new file mode 100644
index 0000000..0be19c0
--- /dev/null
+++ b/debian/patches/findlib-fix-camlp4.patch
@@ -0,0 +1,47 @@
+Index: build-tree/findlib-1.2.5+debian/configure
+===================================================================
+--- build-tree.orig/findlib-1.2.5+debian/configure	2011-04-06 11:52:08.000000000 -0500
++++ build-tree/findlib-1.2.5+debian/configure	2011-04-06 11:53:00.000000000 -0500
+@@ -113,6 +113,7 @@
+ ocamlfind_bin=""
+ ocamlfind_man=""
+ ocaml_sitelib=""
++camlp4bin="camlp4"
+ ocamlfind_config=""
+ with_toolbox=0
+ with_topfind=1
+@@ -132,6 +133,9 @@
+         -config) ocamlfind_config=$2
+ 	         shift 2
+ 		 ;;
++        -camlp4bin) camlp4bin=$2
++                 shift 2
++                 ;;
+ 	-cygpath) system=mingw
+ 	         shift
+ 		 ;;
+@@ -391,20 +395,20 @@
+ 
+ # Check on camlp4:
+ 
+-if in_path camlp4; then
+-    camlp4_dir=`camlp4 -where`
++if test -x "${camlp4bin}" || in_path ${camlp4bin}; then
++    camlp4_dir=`${camlp4bin} -where | tr -d '\r'`
+     if [ ${use_cygpath} -gt 0 ]; then
+ 	camlp4_dir=`echo x | env USE_CYGPATH=1 tools/patch x "$camlp4_dir"`
+         # This makes camlp4_dir a windows path
+     fi
+-    camlp4_version=`camlp4 -v 2>&1`
++    camlp4_version=`${camlp4bin} -v | tr -d '\r' 2>&1`
+     if [ "$have_dlls" = "yes" ]; then
+ 	camlp4_cmd="camlp4"
+     else
+ 	camlp4_cmd="safe_camlp4"
+     fi
+     # Check whether 3.09 or 3.10 style:
+-    if camlp4 -loaded-modules >/dev/null 2>/dev/null; then
++    if ${camlp4bin} -loaded-modules >/dev/null 2>/dev/null; then
+ 	camlp4style=310
+     else
+ 	camlp4style=309
diff --git a/debian/patches/series b/debian/patches/series
index 55f67f0..70f362b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ mingw32-ocaml-fix-ocamlrun-path.patch
 mingw32-ocaml-run-ranlib-on-threads.patch
 mingw32-ocaml-force-os-type.patch
 mingw32-ocaml-win32-compat.patch
+findlib-fix-camlp4.patch
diff --git a/debian/rules b/debian/rules
index 286addd..de1bebd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,6 +119,7 @@ stamp-build-findlib:
 	  -bindir /usr/$(MINGW32_HOST)/bin \
 	  -sitelib /usr/$(MINGW32_HOST)/lib/ocaml \
 	  -mandir /usr/share/man \
+	  -camlp4bin $(INSTALL_PATH)/usr/$(MINGW32_HOST)/bin/camlp4 \
 	  -with-toolbox
 	cd $(DEB_BUILDDIR)/$(FINDLIB_DIR) && make all
 	cd $(DEB_BUILDDIR)/$(FINDLIB_DIR) && make opt

-- 
mingw32-ocaml packaging