tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix el5 build. 

Fixes #5033
This commit is contained in:
Michael Friedrich 2013-12-18 12:54:49 +01:00
parent 2997680cf1
commit 7e03fbb2b4
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -16,6 +16,8 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
set(BOOST_MIN_VERSION "1.41.0")
project(icinga2) project(icinga2)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@ -59,7 +61,8 @@ if(WIN32)
add_definitions(-DBOOST_ALL_NO_LIB) add_definitions(-DBOOST_ALL_NO_LIB)
endif() endif()
find_package(Boost 1.41.0 COMPONENTS thread system program_options regex REQUIRED) find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS thread system program_options regex REQUIRED)
link_directories(${Boost_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS})
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})

8
INSTALL
View File

@ -26,11 +26,17 @@ parentheses):
* Boost library and header files (boost-devel on RHEL, libboost-all-dev * Boost library and header files (boost-devel on RHEL, libboost-all-dev
on Debian) on Debian)
* GNU bison (bison) * GNU bison (bison)
* GNU flex (flex) * GNU flex (flex) >= 2.5.35
* optional: Doxygen (doxygen) * optional: Doxygen (doxygen)
* optional: MySQL (mysql-devel on RHEL, libmysqlclient-dev on Debian) * optional: MySQL (mysql-devel on RHEL, libmysqlclient-dev on Debian)
* optional: Python (python-devel on RHEL, python-dev on Debian) * optional: Python (python-devel on RHEL, python-dev on Debian)
Note: RHEL5 ships an ancient flex version. Updated packages are available for
example from the repoforge buildtools repository.
http://mirror.hs-esslingen.de/repoforge/redhat/el5/en/{i386,x86_64}/buildtools/
User Requirements User Requirements
----------------- -----------------

10
icinga2.spec
View File

@ -60,7 +60,7 @@ BuildRequires: openssl-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libstdc++-devel BuildRequires: libstdc++-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: flex BuildRequires: flex >= 2.5.35
BuildRequires: bison BuildRequires: bison
BuildRequires: %{apachename} BuildRequires: %{apachename}
@ -219,11 +219,17 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \
-DICINGA2_COMMAND_GROUP=%{icingacmd_group}" -DICINGA2_COMMAND_GROUP=%{icingacmd_group}"
%if "%{_vendor}" == "redhat" %if "%{_vendor}" == "redhat"
%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" %if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5"
# Boost_VERSION 1.41.0 vs 101400 - disable build tests
# details in https://dev.icinga.org/issues/5033
CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=/usr/lib/boost141 \ CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=/usr/lib/boost141 \
-DBOOST_INCLUDEDIR=/usr/include/boost141 \ -DBOOST_INCLUDEDIR=/usr/include/boost141 \
-DBoost_ADDITIONAL_VERSIONS='1.41;1.41.0'" -DBoost_ADDITIONAL_VERSIONS='1.41;1.41.0' \
-DBoost_NO_SYSTEM_PATHS=TRUE \
-DBUILD_TESTING=FALSE \
-DBoost_NO_BOOST_CMAKE=TRUE"
%endif %endif
%endif %endif
cmake $CMAKE_OPTS . cmake $CMAKE_OPTS .
make %{?_smp_mflags} make %{?_smp_mflags}