Skip to content
Permalink
Browse files

Removed Boost.

Change-Id: I0af577febd5c97e9736333aee672c7a3baf23751
  • Loading branch information
svenpanne committed Oct 22, 2019
1 parent 95b40ed commit 8b496c6e625f38a1e6761d96c7e7fc01dc3d3d6c
Showing with 11 additions and 10,283 deletions.
  1. +2 −11 Makefile
  2. +0 −1 buildscripts/infrastructure/build-nodes/centos-6/Dockerfile
  3. +0 −1 buildscripts/infrastructure/build-nodes/centos-7/Dockerfile
  4. +0 −1 buildscripts/infrastructure/build-nodes/centos-8/Dockerfile
  5. +0 −3 buildscripts/infrastructure/build-nodes/common/Dockerfile
  6. +0 −1 buildscripts/infrastructure/build-nodes/debian-10/Dockerfile
  7. +0 −1 buildscripts/infrastructure/build-nodes/debian-8/Dockerfile
  8. +0 −1 buildscripts/infrastructure/build-nodes/debian-9/Dockerfile
  9. +0 −1 buildscripts/infrastructure/build-nodes/sles-11sp4/Dockerfile
  10. +0 −1 buildscripts/infrastructure/build-nodes/sles-12/Dockerfile
  11. +0 −1 buildscripts/infrastructure/build-nodes/sles-12sp1/Dockerfile
  12. +0 −1 buildscripts/infrastructure/build-nodes/sles-12sp2/Dockerfile
  13. +0 −1 buildscripts/infrastructure/build-nodes/sles-12sp3/Dockerfile
  14. +0 −1 buildscripts/infrastructure/build-nodes/sles-12sp4/Dockerfile
  15. +0 −1 buildscripts/infrastructure/build-nodes/sles-15/Dockerfile
  16. +0 −1 buildscripts/infrastructure/build-nodes/ubuntu-14.04/Dockerfile
  17. +0 −1 buildscripts/infrastructure/build-nodes/ubuntu-16.04/Dockerfile
  18. +0 −1 buildscripts/infrastructure/build-nodes/ubuntu-18.04/Dockerfile
  19. +0 −1 buildscripts/infrastructure/build-nodes/ubuntu-18.10/Dockerfile
  20. +0 −1 buildscripts/infrastructure/build-nodes/ubuntu-19.04/Dockerfile
  21. +0 −8 configure.ac
  22. +0 −4,116 livestatus/iwyu-mappings/boost-all-private.imp
  23. +0 −5,629 livestatus/iwyu-mappings/boost-all.imp
  24. +0 −115 m4/ax_boost_asio.m4
  25. +0 −301 m4/ax_boost_base.m4
  26. +0 −1 omd/Makefile
  27. +0 −5 omd/Makefile.omd
  28. +2 −2 omd/license_sources/update_licenses.py
  29. +0 −2 omd/packages/boost/.gitignore
  30. +0 −62 omd/packages/boost/boost.make
  31. BIN omd/packages/boost/boost_1_70_0.tar.bz2
  32. +7 −10 omd/packages/packages.make
@@ -373,8 +373,6 @@ setup:
doxygen \
figlet \
g++ \
libboost-dev \
libboost-system-dev \
libclang-7-dev \
libpcap-dev \
librrd-dev \
@@ -413,13 +411,6 @@ config.status: $(CONFIG_DEPS)
echo "update config.status by reconfiguring in the same conditions" ; \
./config.status --recheck; \
else \
if test -d ../boost/destdir ; then \
BOOST_OPT="--with-boost=$(abspath ../boost/destdir)" ; \
elif test -d omd/packages/boost/destdir ; then \
BOOST_OPT="--with-boost=$(abspath omd/packages/boost/destdir)" ; \
else \
BOOST_OPT="DUMMY1=" ; \
fi ; \
if test -d "omd/rrdtool-$(RRDTOOL_VERS)/src/.libs"; then \
RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-$(RRDTOOL_VERS)/src/.libs)" ; \
else \
@@ -432,8 +423,8 @@ config.status: $(CONFIG_DEPS)
else \
RE2_OPT="DUMMY3=" ; \
fi ; \
echo "configure CXXFLAGS=\"$(CXX_FLAGS)\" \"$$BOOST_OPT\" \"$$RRD_OPT\" \"$$RE2_OPT\"" ; \
./configure CXXFLAGS="$(CXX_FLAGS)" "$$BOOST_OPT" "$$RRD_OPT" "$$RE2_OPT" ; \
echo "configure CXXFLAGS=\"$(CXX_FLAGS)\" \"$$RRD_OPT\" \"$$RE2_OPT\"" ; \
./configure CXXFLAGS="$(CXX_FLAGS)" "$$RRD_OPT" "$$RE2_OPT" ; \
fi

configure: $(CONFIGURE_DEPS)
@@ -5,7 +5,6 @@ SHELL ["/bin/bash", "-c"]
RUN yum -y makecache \
&& yum -y install \
bind-utils \
boost-devel \
centos-release-scl \
compat-readline5 \
curl-devel \
@@ -5,7 +5,6 @@ SHELL ["/bin/bash", "-c"]
RUN yum -y makecache \
&& yum -y install \
bind-utils \
boost-devel \
curl-devel \
expat-devel \
flex \
@@ -5,7 +5,6 @@ SHELL ["/bin/bash", "-c"]
RUN yum -y makecache \
&& yum -y --enablerepo=PowerTools install \
bind-utils \
boost-devel \
curl-devel \
expat-devel \
flex \
@@ -30,9 +30,6 @@ RUN apt-get update \
gettext \
git-buildpackage \
ksh \
libboost-all-dev \
libboost-dev \
libboost-system-dev \
libclang-7-dev \
libcurl4-openssl-dev \
libevent-dev \
@@ -16,7 +16,6 @@ RUN apt-get update \
flex \
gettext \
git-buildpackage \
libboost-all-dev \
libcurl4-openssl-dev \
libdbi-dev \
libevent-dev \
@@ -14,7 +14,6 @@ RUN apt-get update \
flex \
gettext \
git-buildpackage \
libboost-all-dev \
libcurl4-openssl-dev \
libdbi-dev \
libevent-dev \
@@ -15,7 +15,6 @@ RUN apt-get update \
flex \
gettext \
git-buildpackage \
libboost-all-dev \
libcurl4-openssl-dev \
libdbi-dev \
libevent-dev \
@@ -5,7 +5,6 @@ SHELL ["/bin/bash", "-c"]
RUN zypper addrepo -G http://10.9.1.101:8081/repository/sles11sp4 sles11sp4 \
&& zypper ref -s \
&& zypper -n in -y --force-resolution \
boost-devel \
cmake \
curl \
samba-client \
@@ -7,7 +7,6 @@ RUN zypper addrepo -G http://nexus:8081/repository/sles12 sles12 \
&& zypper -n in -y --force-resolution \
apache2-devel \
bind-utils \
boost-devel \
cmake \
curl \
flex \
@@ -7,7 +7,6 @@ RUN zypper addrepo http://nexus:8081/repository/sles12sp1 sles12sp1 \
&& zypper -n in -y --force-resolution \
apache2-devel \
bind-utils \
boost-devel \
curl \
flex \
freeradius-client-devel \
@@ -7,7 +7,6 @@ RUN zypper addrepo -G http://nexus:8081/repository/sles12sp2 sles12sp2 \
&& zypper -n in -y --force-resolution \
apache2-devel \
bind-utils \
boost-devel \
curl \
flex \
freeradius-client-devel \
@@ -7,7 +7,6 @@ RUN zypper addrepo -G http://nexus:8081/repository/sles12sp3 sles12sp3 \
&& zypper -n in -y --force-resolution \
apache2-devel \
bind-utils \
boost-devel \
curl \
flex \
freeradius-client-devel \
@@ -8,7 +8,6 @@ RUN zypper addrepo -G http://nexus:8081/repository/sles12sp4 sles12sp4 \
&& zypper -n in -y --force-resolution \
apache2-devel \
bind-utils \
boost-devel \
curl \
flex \
freeradius-client-devel \
@@ -7,7 +7,6 @@ RUN zypper addrepo -G http://nexus:8081/repository/sles15 sles15 \
&& zypper -n in -y --force-resolution \
apache2-devel \
bind-utils \
boost-devel \
curl \
flex \
freeradius-client-devel \
@@ -14,7 +14,6 @@ RUN apt-get update \
flex \
gettext \
git-buildpackage \
libboost-all-dev \
libcurl4-openssl-dev \
libevent-dev \
libffi-dev \
@@ -15,7 +15,6 @@ RUN apt-get update \
flex \
gettext \
git-buildpackage \
libboost-all-dev \
libcurl4-openssl-dev \
libevent-dev \
libffi-dev \
@@ -15,7 +15,6 @@ RUN apt-get update \
flex \
gettext \
git-buildpackage \
libboost-all-dev \
libcurl4-openssl-dev \
libevent-dev \
libffi-dev \
@@ -15,7 +15,6 @@ RUN apt-get update \
flex \
gettext \
git-buildpackage \
libboost-all-dev \
libcurl4-openssl-dev \
libevent-dev \
libffi-dev \
@@ -15,7 +15,6 @@ RUN apt-get update \
flex \
gettext \
git-buildpackage \
libboost-all-dev \
libcurl4-openssl-dev \
libevent-dev \
libffi-dev \
@@ -86,12 +86,6 @@ AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h stdlib.h string.h strings.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h])

# Checks for C++ features
AX_BOOST_BASE(,,AC_MSG_ERROR([Boost library not found or too old]))
AX_BOOST_ASIO
if test "x$ax_cv_boost_asio" = xno; then
AC_MSG_ERROR([Boost::ASIO library not found])
fi

AC_LANG_PUSH([C++])

AC_MSG_CHECKING([whether C++17 headers are supported by default])
@@ -197,8 +191,6 @@ AC_SUBST(nagios_headers)
AC_DEFINE([_GLIBCXX_REGEX_STATE_LIMIT], [2500],
[the maximum number of states the regex NFA can have])

AC_DEFINE([BOOST_SYSTEM_NO_DEPRECATED], [1], [we do not want any old stuff])

# GCC is a bit picky about redefinitions of built-in macros. Alas, "built-in"
# simply means "starts with double underscore", so we have to hack around that
# below. Note that clang is happy, even without the guard.

0 comments on commit 8b496c6

Please sign in to comment.
You can’t perform that action at this time.