diff options
author | Julian Brost | 2019-10-08 19:38:20 +0200 |
---|---|---|
committer | Julian Brost | 2019-10-08 19:38:20 +0200 |
commit | 90393aa7410f9b7644f2dda245284fb85eeab943 (patch) | |
tree | 049d6f150118b7e2a7b0776b083167eabf83ab33 | |
parent | f68063a9608410b621d7a75623ed4365182d5662 (diff) | |
download | aur-90393aa7410f9b7644f2dda245284fb85eeab943.tar.gz |
add workaround for boost version not being detected correctly
There is a problem with CMake>=3.15 and Boost>=1.70.0 where the value of
a variable containing the boost version changed, for more details see
https://github.com/Icinga/icinga2/issues/7566
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | icinga2.changelog | 4 |
3 files changed, 14 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = icinga2 pkgdesc = An open source host, service and network monitoring program pkgver = 2.11.0 - pkgrel = 1 + pkgrel = 2 url = http://www.icinga.org install = icinga2.install changelog = icinga2.changelog @@ -4,7 +4,7 @@ pkgname='icinga2' pkgver=2.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open source host, service and network monitoring program" license=('GPL') arch=('i686' 'x86_64') @@ -53,6 +53,9 @@ build() { mkdir -p "$srcdir/$pkgname-$pkgver/build" cd "$srcdir/$pkgname-$pkgver/build" + # The four lines settings variables regarding boost are a workaround for the + # boost version not being detected properly, see also + # https://github.com/Icinga/icinga2/issues/7566 cmake "$srcdir/$pkgname-$pkgver" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ @@ -63,7 +66,11 @@ build() { -DICINGA2_SYSCONFIGFILE=/etc/default/icinga2 \ -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins \ -DUSE_SYSTEMD=ON \ - -DLOGROTATE_HAS_SU=OFF + -DLOGROTATE_HAS_SU=OFF \ + -DBoost_NO_BOOST_CMAKE=TRUE \ + -DBoost_NO_SYSTEM_PATHS=TRUE \ + -DBOOST_LIBRARYDIR=/usr/lib \ + -DBOOST_INCLUDEDIR=/usr/include make } diff --git a/icinga2.changelog b/icinga2.changelog index 010b7588cd09..ee3a1265c7e5 100644 --- a/icinga2.changelog +++ b/icinga2.changelog @@ -1,3 +1,7 @@ +2.11.0-2 + - Manually specify boost paths to fix building with boost 1.71.0 and recent + cmake versions + 2.11.0-1 - New upstream version 2.11.0 |