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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-10-09 04:14:06 +0000 (Sun, 09 Oct 2011)
New Revision: 1393

Modified:
   openldap/trunk/debian/rules
Log:
RESOLV_MULTI needs to be exported, not passed as an argument to dh_auto_test;
just export it globally, further simplifying debian/rules

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2011-10-09 03:55:51 UTC (rev 1392)
+++ openldap/trunk/debian/rules	2011-10-09 04:14:06 UTC (rev 1393)
@@ -7,6 +7,9 @@
 export DEB_CFLAGS_MAINT_APPEND := -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 export DEB_BUILD_MAINT_OPTIONS := hardening=+pie,+bindnow
 
+# Workaround for bad glibc behavior when resolving localhost
+export RESOLV_MULTI = off
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CONFIG		= $(shell grep -v "^\#" debian/configure.options)
@@ -72,10 +75,6 @@
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd
 	$(MAKE) -C contrib/slapd-modules/autogroup
 
-override_dh_auto_test:
-	dh_auto_test -- RESOLV_MULTI=off
-
-
 # Check all built libraries for unresolved symbols except for the libslapi
 # library.  It is a special case since the SLAPI interface depends on symbols
 # defined in slapd itself.  Those symbols will remain unresolved until the