tyler.durden
/
rpm-icinga2
mirror of https://git.icinga.com/packaging/rpm-icinga2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor boost handling 

* el6: Use new boost name
* Allow configuration of rpath when required
This commit is contained in:
Markus Frosch 2019-03-12 16:09:18 +01:00
parent 8967de99ff
commit 8fc126f97a
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
icinga2.spec
View File

@ -143,26 +143,34 @@ BuildRequires: flex >= 2.5.35
BuildRequires: make BuildRequires: make
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
%if 0%{?suse_version} > 1320 # SLES 15 and OpenSUSE %if 0%{?suse_version} > 1320 # SLES 15 and OpenSUSE
# TODO: multiple packages
%define boost_devel_pkg %nil
BuildRequires: libboost_program_options-devel >= %{boost_min_version} BuildRequires: libboost_program_options-devel >= %{boost_min_version}
BuildRequires: libboost_regex-devel >= %{boost_min_version} BuildRequires: libboost_regex-devel >= %{boost_min_version}
BuildRequires: libboost_system-devel >= %{boost_min_version} BuildRequires: libboost_system-devel >= %{boost_min_version}
BuildRequires: libboost_thread-devel >= %{boost_min_version} BuildRequires: libboost_thread-devel >= %{boost_min_version}
%else #suse_version > 1320 %endif #suse_version > 1320
BuildRequires: boost-devel >= %{boost_min_version}
%endif #suse_version > 1320
%else # vendor == suse - assuming redhat or compatible %else # vendor == suse - assuming redhat or compatible
%if (0%{?el6} || 0%{?rhel} == 6) || (0%{?el7} || 0%{?rhel} == 7) %if (0%{?el6} || 0%{?rhel} == 6)
%define boost_library boost169 # Provided by packages.icinga.com
%define boost_version 1.69 %define boost_library icinga-boost169
# el6: Provided by packages.icinga.com %define boost_version 1.69
# el7: Provided from EPEL %define boost_devel_pkg icinga-boost169-devel
BuildRequires: boost169-devel >= %{boost_min_version} %define boost_rpath %{_libdir}/%{boost_library}
%else # el6 or el7 %endif # el6
BuildRequires: boost-devel >= %{boost_min_version} %if (0%{?el7} || 0%{?rhel} == 7)
%endif # el6 or el7 # Provided by EPEL
%define boost_library boost169
%define boost_version 1.69
%define boost_devel_pkg boost169-devel
%endif # el7
%endif # vendor == suse %endif # vendor == suse
%if "%{?boost_devel_pkg}" != "%nil"
BuildRequires: %{?boost_devel_pkg}%{!?boost_devel_pkg:boost-devel} >= %{boost_min_version}
%endif # boost_devel_pkg
%if 0%{?use_systemd} %if 0%{?use_systemd}
BuildRequires: systemd-devel BuildRequires: systemd-devel
Requires: systemd Requires: systemd
@ -329,6 +337,10 @@ CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_STUDIO=true"
CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_EXE_LINKER_FLAGS=-lrt" CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_EXE_LINKER_FLAGS=-lrt"
%endif # el6 %endif # el6
%if "%{?boost_rpath}" != ""
CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_INSTALL_RPATH=%{boost_rpath}"
%endif # boost_rpath
%if "%{?boost_library}" != "" %if "%{?boost_library}" != ""
# Boost_NO_BOOST_CMAKE=ON - disable search for cmake # Boost_NO_BOOST_CMAKE=ON - disable search for cmake
# Boost_NO_SYSTEM_PATHS=ON - only search in specified locations # Boost_NO_SYSTEM_PATHS=ON - only search in specified locations