[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-7-6-gbb27d9f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 2e986cb460eb7623e5f38703b9f73ae60e18b6d2
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon May 3 20:22:08 2010 +0200

    Add 0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch

diff --git a/debian/patches/0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch b/debian/patches/0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch
new file mode 100644
index 0000000..4e3f726
--- /dev/null
+++ b/debian/patches/0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch
@@ -0,0 +1,39 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Mon, 3 May 2010 20:20:46 +0200
+Subject: [PATCH] Use OCaml version to guess str stubs link options
+
+Closes: #580093.
+---
+ configure |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 8fe0dbf..8ed9e36 100755
+--- a/configure
++++ b/configure
+@@ -680,6 +680,15 @@ if [ $enable_apache -gt 0 ]; then
+ 	exit 1
+     fi
+ 
++    case `ocamlc -version` in
++        3.12*)
++            str_stubs=-lcamlstr
++            ;;
++        *)
++            str_stubs=-lstr
++            ;;
++    esac
++
+ fi
+ 
+ ######################################################################
+@@ -786,7 +795,7 @@ AUTHDHREQS = $adh_reqs
+ # For -enable-apache
+ APACHE_MAJOR = $apache_major
+ APACHE_LIBDIR = $apache_libdir
+-APACHE_OCAMLLIBS = -lcamlrun -ltermcap -lunix -lstr
++APACHE_OCAMLLIBS = -lcamlrun -ltermcap -lunix $str_stubs
+ APACHE_INCDIR = $apache_incdir
+ APACHE_CONFDIR = $apache_confdir
+ APACHE_LDFLAGS_SHLIB = $apache_ldflags_shlib
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 39266be..c58144f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0009-Recognize-GNU-kFreeBSD-as-FreeBSD.patch
 0010-Fix-faulty-ssl-bindings-closes-450903.patch
 0011-Force-major-version-for-apache-to-2.patch
+0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch

-- 
ocamlnet packaging