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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-07-07 00:16:51 +0000 (Mon, 07 Jul 2008)
New Revision: 1164

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/rules
Log:
* Support DEB_BUILD_OPTIONS=nocheck to disable running the test suite at
  build time
* Hack around glibc behavior when resolving localhost, by exporting
  RESOLV_MULTI=off when invoking the test suite

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-07-01 00:38:48 UTC (rev 1163)
+++ openldap/trunk/debian/changelog	2008-07-07 00:16:51 UTC (rev 1164)
@@ -1,3 +1,12 @@
+openldap2.3 (2.4.10-2) UNRELEASED; urgency=low
+
+  * Support DEB_BUILD_OPTIONS=nocheck to disable running the test suite at
+    build time
+  * Hack around glibc behavior when resolving localhost, by exporting
+    RESOLV_MULTI=off when invoking the test suite
+
+ -- Steve Langasek <vorlon at debian.org>  Mon, 30 Jun 2008 13:13:58 -0700
+
 openldap2.3 (2.4.10-1) unstable; urgency=low
 
   [ Steve Langasek ]

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2008-07-01 00:38:48 UTC (rev 1163)
+++ openldap/trunk/debian/rules	2008-07-07 00:16:51 UTC (rev 1164)
@@ -101,7 +101,9 @@
 build-indep:
 build-stamp: configure-stamp
 	$(MAKE) -C $(builddir) $(MAKEVARS)
-	$(MAKE) -C $(builddir) test
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	RESOLV_MULTI=off $(MAKE) -C $(builddir) test
+endif
 	touch $@
 
 # Check all built libraries for unresolved symbols except for the libslapi