From 4fe0f600d7f283afab68f4c32800fab89e86aaef Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 9 Mar 2012 14:20:54 -0800 Subject: [PATCH] debian: Avoid unit test failure when doing "unofficial" builds. The configure option --with-build-number=0 is interpreted differently in different places. The configure script itself accepts 0 as an actual build number and puts '#define BUILDNR "+build0"' into config.h. The code in python/automake.mk treats 0 as "no build number" and puts 'BUILDNR = ""' into version.py. This commit avoids the problem by not passing 0 as a build number. Reviewed-by: Simon Horman Signed-off-by: Ben Pfaff --- debian/rules | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 1953ee55e..4160025a4 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,12 @@ else CFLAGS += -O2 endif +ifeq ($(BUILD_NUMBER),0) +BUILD_NUMBER_OPTION = +else +BUILD_NUMBER_OPTION = --with-build-number=$(BUILD_NUMBER) +endif + configure: configure-stamp configure-stamp: dh_testdir @@ -41,7 +47,7 @@ configure-stamp: cd _debian && ( \ test -e Makefile || \ ../configure --prefix=/usr --localstatedir=/var --enable-ssl \ - --sysconfdir=/etc --with-build-number=$(BUILD_NUMBER) \ + --sysconfdir=/etc $(BUILD_NUMBER_OPTION) \ CFLAGS="$(CFLAGS)" $(DATAPATH_CONFIGURE_OPTS)) touch configure-stamp -- 2.43.0