Build fixes (#2324)

* Build fixes

* Fixes

* remove libzookeeper-mt-dev

* fix

* fix

* wrong

* try fix

* fix

* Update CMakeLists.txt

* Fixes

* Update boost to 1.67.0

* Fix ninja

* fix

contrib/boost

@@ -1 +1 @@
-Subproject commit 5121cc9d0375c7b81b24b6087a51684e6cd62ded
+Subproject commit 2d5cb2c86f61126f4e1efe9ab97332efd44e7dea

debian/.pbuilderrc

@@ -173,8 +173,6 @@ else
     export CMAKE_FLAGS="-DENABLE_EMBEDDED_COMPILER=0 $CMAKE_FLAGS"
 fi
 
-[[ "$DIST" != "bionic" && "$DIST" != "unstable" && "$DIST" != "experimental" ]] && EXTRAPACKAGES+=" ninja-build "
-
 # will test symbols
 #EXTRAPACKAGES+=" gdb "
 

debian/control

@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
 Build-Depends: debhelper (>= 9),
                cmake3 | cmake,
+               ninja-build,
                gcc-7, g++-7,
                libc6-dev,
                libmariadbclient-dev | default-libmysqlclient-dev | libmysqlclient-dev,

debian/pbuilder-hooks/C99kill-make

@@ -2,4 +2,4 @@
 
 # Try stop parallel build after timeout
 
-killall make gcc gcc-7 g++-7 clang-5.0 clang++-5.0 || true
+killall make gcc gcc-7 g++-7 gcc-8 g++-8 clang-5.0 clang++-5.0 clang-6.0 clang++-6.0 clang-7 clang++-7 || true

debian/rules

@@ -15,10 +15,10 @@ DESTDIR = $(CURDIR)/debian/tmp
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 #TODO: why it not working? (maybe works in debhelper 10+)
-#ifndef THREADS_COUNT
-#    THREADS_COUNT:=$(shell nproc || grep -c ^processor /proc/cpuinfo)
-#endif
-#DEB_BUILD_OPTIONS+=parallel=$(THREADS_COUNT)
+ifndef THREADS_COUNT
+    THREADS_COUNT=$(shell nproc || grep -c ^processor /proc/cpuinfo || sysctl -n hw.ncpu || echo 4)
+endif
+DEB_BUILD_OPTIONS+=parallel=$(THREADS_COUNT)
 
 ifndef ENABLE_TESTS
     CMAKE_FLAGS += -DENABLE_TESTS=0
@@ -58,6 +58,8 @@ endif
 # Useful for bulding on low memory systems
 ifndef DISABLE_PARALLEL
     DH_FLAGS += --parallel
+else
+    THREADS_COUNT = 1
 endif
 
 %:
@@ -66,6 +68,10 @@ endif
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_FLAGS)
 
+override_dh_auto_build:
+	# Fix fir ninja. Do not add -O.
+	cd $(BUILDDIR) && $(MAKE) -j$(THREADS_COUNT)
+
 override_dh_auto_test:
 	#TODO, use ENABLE_TESTS=1
 	#./debian/tests_wrapper.sh

release

@@ -82,10 +82,6 @@ elif [[ $BUILD_TYPE == 'debug' ]]; then
     VERSION_POSTFIX+=-$BUILD_TYPE
 fi
 
-if [ -z "$THREAD_COUNT" ] ; then
-    THREAD_COUNT=`nproc || grep -c ^processor /proc/cpuinfo || sysctl -n hw.ncpu || echo 4`
-fi
-
 CMAKE_FLAGS=" $LIBTCMALLOC_OPTS -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DENABLE_EMBEDDED_COMPILER=1 $CMAKE_FLAGS"
 export CMAKE_FLAGS
 export EXTRAPACKAGES
@@ -97,7 +93,7 @@ gen_changelog "$REVISION" "" "$AUTHOR" ""
 
 if [ -z "$USE_PBUILDER" ] ; then
     # Build (only binary packages).
-    debuild -e PATH -e SSH_AUTH_SOCK -e DEB_BUILD_OPTIONS=parallel=$THREAD_COUNT \
+    debuild -e PATH -e SSH_AUTH_SOCK \
     -e DEB_CC=$DEB_CC -e DEB_CXX=$DEB_CXX -e CMAKE_FLAGS="$CMAKE_FLAGS" \
     -b ${DEBUILD_NOSIGN_OPTIONS} ${DEBUILD_NODEPS_OPTIONS}
 else