18 Jan
2018
18 Jan
'18
1:50 p.m.
Module: check_mk
Branch: master
Commit: fffef02eb2217e2fb250217636d993a20927144b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fffef02eb2217e…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Jan 18 13:41:06 2018 +0100
Yet another fix for the Boost paths.
The amount of copy-n-paste is really impressive... :-/
While we're here: Removed the special case for Boost 1.41 on CentOS 5, it is
too old to be even compiled nowadways.
Change-Id: Ib00179ead40325bb655e1c8aa49acc83ebbf5fb1
---
Makefile | 2 --
omd/distros/CENTOS_5.mk | 1 -
omd/packages/mk-livestatus/Makefile | 8 ++------
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index c0e227a..ec238e8 100644
--- a/Makefile
+++ b/Makefile
@@ -420,8 +420,6 @@ config.status: $(DIST_DEPS)
BOOST_OPT="--with-boost=$(abspath ../boost/destdir)" ; \
elif test -d omd/packages/boost/destdir ; then \
BOOST_OPT="--with-boost=$(abspath omd/packages/boost/destdir)" ; \
- elif test ! -d /usr/include/boost -a -d /usr/include/boost141/boost ; then \
- BOOST_OPT="CPPFLAGS=-I/usr/include/boost141" ; \
else \
BOOST_OPT="DUMMY1=" ; \
fi ; \
diff --git a/omd/distros/CENTOS_5.mk b/omd/distros/CENTOS_5.mk
index 78623fc..adabad9 100644
--- a/omd/distros/CENTOS_5.mk
+++ b/omd/distros/CENTOS_5.mk
@@ -1,6 +1,5 @@
DISTRO_CODE = el5
BUILD_PACKAGES =
-BUILD_PACKAGES += boost141-devel
BUILD_PACKAGES += curl-devel # needed by perl modules / thruk
BUILD_PACKAGES += expat-devel
BUILD_PACKAGES += fping
diff --git a/omd/packages/mk-livestatus/Makefile b/omd/packages/mk-livestatus/Makefile
index 23a77ad..90a586a 100644
--- a/omd/packages/mk-livestatus/Makefile
+++ b/omd/packages/mk-livestatus/Makefile
@@ -10,12 +10,8 @@ build: clean
$(MAKE) -C ../../.. $(DIR).tar.gz ; \
fi
tar xzf ../../../$(DIR).tar.gz
- @if test -d ../boost/local ; then \
- BOOST_OPT="--with-boost=$(abspath ../boost/local)" ; \
- elif test -d ../cmk-omd/packages/boost/local ; then \
- BOOST_OPT="--with-boost=$(abspath ../cmk-omd/packages/boost/local)" ; \
- elif test ! -d /usr/include/boost -a -d /usr/include/boost141/boost ; then \
- BOOST_OPT="CPPFLAGS=-I/usr/include/boost141" ; \
+ @if test -d "$(PACKAGE_BOOST_DESTDIR)" ; then \
+ BOOST_OPT="--with-boost=$(PACKAGE_BOOST_DESTDIR)" ; \
else \
BOOST_OPT="DUMMY1=" ; \
fi ; \