Use the boost packages from packages.icinga.org

This commit is contained in:
Gunnar Beutner 2014-12-05 14:05:08 +01:00
parent ec99efbc28
commit e583eced58

View File

@ -99,8 +99,8 @@ BuildRequires: bison
BuildRequires: make BuildRequires: make
%if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5") %if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5")
# el5 requires EPEL # el5 requires packages.icinga.org
BuildRequires: boost141-devel BuildRequires: boost153-devel
%else %else
BuildRequires: boost-devel >= 1.41 BuildRequires: boost-devel >= 1.41
%endif %endif
@ -202,9 +202,9 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \
%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 # Boost_VERSION 1.41.0 vs 101400 - disable build tests
# details in https://dev.icinga.org/issues/5033 # 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 \
-DBOOST_INCLUDEDIR=/usr/include/boost141 \ -DBOOST_INCLUDEDIR=/usr/include \
-DBoost_ADDITIONAL_VERSIONS='1.41;1.41.0' \ -DBoost_ADDITIONAL_VERSIONS='1.53;1.53.0' \
-DBoost_NO_SYSTEM_PATHS=TRUE \ -DBoost_NO_SYSTEM_PATHS=TRUE \
-DBUILD_TESTING=FALSE \ -DBUILD_TESTING=FALSE \
-DBoost_NO_BOOST_CMAKE=TRUE" -DBoost_NO_BOOST_CMAKE=TRUE"