From 22c9223f05ea35985b5e72035ae57a8a36e61790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 28 Sep 2016 13:59:07 +0200 Subject: [PATCH] update build --- debian/control | 1 - debian/rules | 10 +++++++++- guh.pri | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index a492dc8e..1b8ef83f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Homepage: https://guh.io Vcs-Git: https://github.com/guh/guh.git Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), - hardening-wrapper, python, rsync, qtchooser, diff --git a/debian/rules b/debian/rules index d4c8ecfb..3fc29224 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,18 @@ #!/usr/bin/make -f # -*- makefile -*- -# Uncomment this to turn on verbose mode. export DH_VERBOSE=1 export QT_QPA_PLATFORM=minimal +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else + DEB_PARALLEL_JOBS += $(shell getconf _NPROCESSORS_ONLN) +endif + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + %: dh $@ --parallel diff --git a/guh.pri b/guh.pri index 2b9ad145..d98a267f 100644 --- a/guh.pri +++ b/guh.pri @@ -14,6 +14,11 @@ QT+= network websockets bluetooth QMAKE_CXXFLAGS += -Werror -std=c++11 -g QMAKE_LFLAGS += -std=c++11 +QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS) +QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS) +QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS) +QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS) + top_srcdir=$$PWD top_builddir=$$shadowed($$PWD)