Skip to content

Commit c675ce5

Browse files
author
Pavel Siska
committed
Rpmbuild: Ensured the toolset is enabled when needed in the %build section based on GCC version.
1 parent 9a823cf commit c675ce5

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

pkg/rpm/ipfixprobe-msec.spec.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ that make up the main components of the test environment.
4444
%autosetup
4545

4646
%build
47+
%if 0%{?gcc_version} < 10
48+
source /opt/rh/gcc-toolset-13/enable
49+
%endif
4750
%cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_MILISECONDS_TIMESTAMP=ON
4851
%cmake_build
4952

pkg/rpm/ipfixprobe-nemea.spec.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ that make up the main components of the test environment.
5959
%autosetup
6060

6161
%build
62+
%if 0%{?gcc_version} < 10
63+
source /opt/rh/gcc-toolset-13/enable
64+
%endif
6265
%cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_NEMEA=ON %{?with_output_unirec: -DENABLE_OUTPUT_UNIREC=ON}
6366
%cmake_build
6467

pkg/rpm/ipfixprobe.spec.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ that make up the main components of the test environment.
9191
%autosetup
9292

9393
%build
94+
%if 0%{?gcc_version} < 10
95+
source /opt/rh/gcc-toolset-13/enable
96+
%endif
9497
%cmake -DCMAKE_BUILD_TYPE=Release %{?with_input_pcap:-DENABLE_INPUT_PCAP=ON} %{?with_input_dpdk:-DENABLE_INPUT_DPDK=ON} %{?with_input_nfb:-DENABLE_INPUT_NFB=ON} %{?with_process_experimental: -DENABLE_PROCESS_EXPERIMENTAL=ON}
9598
%cmake_build
9699

0 commit comments

Comments
 (0)