Commit bc6fc8c4 authored by Markus Frosch's avatar Markus Frosch
Browse files

Merge branch 'bugfix/gcc-7-bionic'

parents be06ed23 9281bead
...@@ -11,7 +11,7 @@ Build-Depends: ...@@ -11,7 +11,7 @@ Build-Depends:
dh-systemd (>= 1.5), dh-systemd (>= 1.5),
libsystemd-dev, libsystemd-dev,
flex, flex,
g++ (>= 1.96), g++ (>= 4:8.0) | g++-8 | g++ (<< 4:7),
libboost-dev (>= 1.66) | libboost1.67-dev | libboost1.67-icinga-dev, libboost-dev (>= 1.66) | libboost1.67-dev | libboost1.67-icinga-dev,
libboost-context-dev (>= 1.66) | libboost-context1.67-dev | libboost-context1.67-icinga-dev, libboost-context-dev (>= 1.66) | libboost-context1.67-dev | libboost-context1.67-icinga-dev,
libboost-coroutine-dev (>= 1.66) | libboost-coroutine1.67-dev | libboost-coroutine1.67-icinga-dev, libboost-coroutine-dev (>= 1.66) | libboost-coroutine1.67-dev | libboost-coroutine1.67-icinga-dev,
......
...@@ -2,12 +2,17 @@ ...@@ -2,12 +2,17 @@
#export DH_VERBOSE=1 #export DH_VERBOSE=1
LTO_BUILD = -DICINGA2_LTO_BUILD=On CXX_INSTALLED_VERSION := $(shell dpkg-query --showformat='$${Version}' --show g++)
CXX_PREFERED_VERSION = 4:8.0
CXX_PREFERED_COMPILER = g++-8
C_PREFERED_COMPILER = gcc-8
CMAKE_FLAGS = -DICINGA2_LTO_BUILD=On
DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifneq (,$(wildcard /usr/include/icinga-boost)) ifneq (,$(wildcard /usr/include/icinga-boost))
BOOST_FLAGS = \ CMAKE_FLAGS += \
-DBoost_NO_BOOST_CMAKE=TRUE \ -DBoost_NO_BOOST_CMAKE=TRUE \
-DBoost_NO_SYSTEM_PATHS=TRUE \ -DBoost_NO_SYSTEM_PATHS=TRUE \
-DBOOST_LIBRARYDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/icinga-boost \ -DBOOST_LIBRARYDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/icinga-boost \
...@@ -17,18 +22,24 @@ endif ...@@ -17,18 +22,24 @@ endif
# disable unity/lto builds for arches with low memory # disable unity/lto builds for arches with low memory
ifneq ($(findstring $(DEB_HOST_ARCH), armhf),) ifneq ($(findstring $(DEB_HOST_ARCH), armhf),)
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off CMAKE_FLAGS += -DICINGA2_UNITY_BUILD=Off
LTO_BUILD = -DICINGA2_LTO_BUILD=Off CMAKE_FLAGS += -DICINGA2_LTO_BUILD=Off
endif endif
ifneq ($(findstring $(DEB_HOST_ARCH), mips),) ifneq ($(findstring $(DEB_HOST_ARCH), mips),)
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off CMAKE_FLAGS += -DICINGA2_UNITY_BUILD=Off
LTO_BUILD = -DICINGA2_LTO_BUILD=Off CMAKE_FLAGS += -DICINGA2_LTO_BUILD=Off
endif endif
ifneq ($(findstring $(DEB_HOST_ARCH), mipsel),) # check if the installed default g++ is already newer as preferred
UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off ifneq ($(shell dpkg --compare-versions "$(CXX_INSTALLED_VERSION)" ge "$(CXX_PREFERED_VERSION)" && echo 1 || echo 0),1)
LTO_BUILD = -DICINGA2_LTO_BUILD=Off # if not choose the prefered compiler directly
ifneq (,$(shell command -v $(CXX_PREFERED_COMPILER) 2>/dev/null))
# if it is installed
$(warning Installed GCC $(CXX_INSTALLED_VERSION) is older than $(CXX_PREFERED_VERSION) - using alternative binary $(CXX_PREFERED_COMPILER))
CMAKE_FLAGS += -DCMAKE_CXX_COMPILER=$(CXX_PREFERED_COMPILER)
CMAKE_FLAGS += -DCMAKE_C_COMPILER=$(C_PREFERED_COMPILER)
endif
endif endif
%: %:
...@@ -59,9 +70,7 @@ override_dh_auto_configure: ...@@ -59,9 +70,7 @@ override_dh_auto_configure:
-DICINGA2_GIT_VERSION_INFO=false \ -DICINGA2_GIT_VERSION_INFO=false \
-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \ -DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
-DUSE_SYSTEMD=ON \ -DUSE_SYSTEMD=ON \
$(BOOST_FLAGS) \ $(CMAKE_FLAGS)
$(UNITY_BUILD) \
$(LTO_BUILD)
override_dh_auto_install: override_dh_auto_install:
dh_auto_install dh_auto_install
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment