upd: debian package compat to v9

Change-Id: Id91e92382e00b0ddb2fbc7aaf3233b81d849849f

diff --git a/debian/compat b/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/test/Makefile b/test/Makefile
index 756e9a24305e7e8cbc0b6576c49d10e71bb74b6c..8d28c3ff53a04829343ade48c403ca2899365095 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,11 +1,5 @@
 MKDIR = mkdir -p
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
 BIN="bin/cassiopeia-test"
 LIBS=openssl collisiondetect
 
@@ -15,14 +9,22 @@ CXX=libtool --mode=compile g++
 CXX_DEP=g++
 LD=libtool --mode=link g++
 
+# Debhelper messes with environment variables which leads to wrong environment variable injection
+# into CFLAGS. Therefore we do not append but override.
+CFLAGS=${ADDFLAGS} -Wall -Werror -Wextra -pedantic -std=c++11 -I../src -I../lib/openssl/include
+CXXFLAGS=$(CFLAGS)
+LDFLAGS=${ADDFLAGS} -lssl -lcrypto -ldl -lboost_unit_test_framework -L../lib/openssl -L/usr/lib/i386-linux-gnu -lpqxx -lpq
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+else
+    CFLAGS += -O2
+endif
+
 ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
 CFLAGS+=-DNO_DAEMON -g -Og
 endif
 
-CFLAGS+=${ADDFLAGS} -Wall -Werror -Wextra -pedantic -std=c++11 -I../src -I../lib/openssl/include
-CXXFLAGS=$(CFLAGS)
-LDFLAGS+=${ADDFLAGS} -lssl -lcrypto -ldl -lboost_unit_test_framework -L../lib/openssl -L/usr/lib/i386-linux-gnu -lpqxx -lpq
-
 ifneq (,$(filter coverage,$(DEB_BUILD_OPTIONS)))
     LDFLAGS += -lgcov
     CFLAGS += -fprofile-arcs -ftest-coverage