[Pkg-openldap-devel] r1421 - openldap/trunk/debian

[vorlon at alioth.debian.org]

tags 654824 pending
thanks

Author: vorlon
Date: 2012-06-16 20:57:56 +0000 (Sat, 16 Jun 2012)
New Revision: 1421

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/rules
Log:
* Incorporate NMU (thanks, Julien Cristau):
  - Disable the mdb backend on non-Linux, it looks like it doesn't work
    with linuxthreads (closes: #654824).

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2012-05-07 00:09:55 UTC (rev 1420)
+++ openldap/trunk/debian/changelog	2012-06-16 20:57:56 UTC (rev 1421)
@@ -1,5 +1,9 @@
 openldap (2.4.28-2) UNRELEASED; urgency=low
 
+  * Incorporate NMU (thanks, Julien Cristau):
+    - Disable the mdb backend on non-Linux, it looks like it doesn't work
+      with linuxthreads (closes: #654824).
+
   [ Peter Marschall ]
   * debian/slapd.scripts-common: avoid grep warnings
   * debian/patches/heimdal-fix: fix arguments of

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2012-05-07 00:09:55 UTC (rev 1420)
+++ openldap/trunk/debian/rules	2012-06-16 20:57:56 UTC (rev 1421)
@@ -11,8 +11,12 @@
 export RESOLV_MULTI = off
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 CONFIG		= $(shell grep -v "^\#" debian/configure.options)
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+	CONFIG += --disable-mdb
+endif
 
 installdir	:= $(CURDIR)/debian/tmp
 builddir	:= $(CURDIR)/debian/build