[pkg-db-commits] [SCM] Berkeley DB Debian packaging branch, debian-sid, updated. debian/5.1.25-10-34-g42cbaf8

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit cafc87e342f86dda317faf05fa22ef112a6fbcc9
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Sep 23 12:21:33 2011 +0200

    Do double build and --disable-test for production version of Berkeley DB

diff --git a/debian/rules b/debian/rules
index 62c3363..29831a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,8 +51,7 @@ CONFIGURE_SWITCHES =    --prefix=/usr \
 			--enable-sql \
 			--enable-stl \
 			--enable-tcl \
-			--with-tcl=/usr/lib \
-			--enable-test
+			--with-tcl=/usr/lib
 
 ifeq (zx86_64-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z)
 CONFIGURE_SWITCHES += --with-mutex=POSIX/pthreads/library
@@ -93,23 +92,29 @@ version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 	dh $@ $(DH_PLUGINS)
 
 override_dh_auto_configure:
-	dh_auto_configure -Ddist -Bbuild -- $(CONFIGURE_SWITCHES)
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	dh_auto_configure -Ddist -Bbuild-test -- $(CONFIGURE_SWITCHES) --enable-test
+endif
+	dh_auto_configure -Ddist -Bbuild-production -- $(CONFIGURE_SWITCHES) --disable-test
 
 override_dh_auto_clean:
-	dh_auto_clean -Ddist -Bbuild
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	dh_auto_clean -Ddist -Bbuild-test
+endif
+	dh_auto_clean -Ddist -Bbuild-production
 	rm -f $(CURDIR)/debian/build_signature.txt
 
 override_dh_auto_test:
 ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(VERY_BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(VERY_BROKEN_SYSTEMS)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	chmod +x ./debian/runtests.tclsh
-	cd build && ../debian/runtests.tclsh || true
+	cd build-test && ../debian/runtests.tclsh || true
 
 ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(BROKEN_SYSTEMS)))
-	! grep ^FAIL build/ALL.OUT
+	! grep ^FAIL build-test/ALL.OUT
 else
 # Testsuite failures are marked as non-fatal on $(DEB_BUILD_GNU_SYSTEM)-$(DEB_BUILD_GNU_CPU)
-	grep ^FAIL build/ALL.OUT || true
+	grep ^FAIL build-test/ALL.OUT || true
 endif
 else
 # Testsuite has been disabled by DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)
@@ -119,7 +124,7 @@ else
 endif
 
 override_dh_auto_install:
-	dh_auto_install -Ddist -Bbuild
+	dh_auto_install -Ddist -Bbuild-production
 
 # Remove .la files
 	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la

-- 
Berkeley DB Debian packaging