Skip to content

Commit f120286

Browse files
author
Pavel Siska
committed
Spec: Update gcc-c++ dependency for C++23
Switch project standard from C++20 to C++23, requiring newer GCC. Updated spec file to reflect correct gcc-c++ version.
1 parent 4597d14 commit f120286

File tree

3 files changed

+6
-21
lines changed

3 files changed

+6
-21
lines changed

pkg/rpm/ipfixprobe-msec.spec.in

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,12 @@ Conflicts: ipfixprobe-nemea, ipfixprobe
1616
Source0: %{name}-%{version}.tar.gz
1717

1818
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
19-
%if 0%{?rhel} == 8
19+
%if 0%{?rhel} < 10
2020
BuildRequires: gcc-toolset-14
2121
BuildRequires: gcc-toolset-14-gcc
2222
BuildRequires: gcc-toolset-14-gcc-c++
2323
%endif
2424

25-
%if 0%{?rhel} >= 9
26-
BuildRequires: gcc >= 10
27-
BuildRequires: gcc-c++ >= 10
28-
%endif
29-
3025
BuildRequires: make
3126
BuildRequires: cmake >= 3.12
3227
BuildRequires: libunwind-devel
@@ -57,7 +52,7 @@ Export timestamp in milliseconds.
5752
%autosetup
5853

5954
%build
60-
%if 0%{?rhel} == 8
55+
%if 0%{?rhel} < 10
6156
source /opt/rh/gcc-toolset-14/enable
6257
%endif
6358
%cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_MILLISECONDS_TIMESTAMP=ON

pkg/rpm/ipfixprobe-nemea.spec.in

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,12 @@ Conflicts: ipfixprobe, ipfixprobe-msec, ipfixprobe-process-experimental
1919
Source0: %{name}-%{version}.tar.gz
2020

2121
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
22-
%if 0%{?rhel} == 8
22+
%if 0%{?rhel} < 10
2323
BuildRequires: gcc-toolset-14
2424
BuildRequires: gcc-toolset-14-gcc
2525
BuildRequires: gcc-toolset-14-gcc-c++
2626
%endif
2727

28-
%if 0%{?rhel} >= 9
29-
BuildRequires: gcc >= 10
30-
BuildRequires: gcc-c++ >= 10
31-
%endif
32-
3328
BuildRequires: make
3429
BuildRequires: cmake >= 3.12
3530
BuildRequires: libunwind-devel
@@ -80,7 +75,7 @@ Experimental process plugins.
8075
%autosetup
8176

8277
%build
83-
%if 0%{?rhel} == 8
78+
%if 0%{?rhel} < 10
8479
source /opt/rh/gcc-toolset-14/enable
8580
%endif
8681
%cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_NEMEA=ON %{?with_output_unirec: -DENABLE_OUTPUT_UNIREC=ON} %{?with_process_experimental: -DENABLE_PROCESS_EXPERIMENTAL=ON}

pkg/rpm/ipfixprobe.spec.in

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,12 @@ Conflicts: ipfixprobe-nemea, ipfixprobe-msec
2121
Source0: %{name}-%{version}.tar.gz
2222

2323
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
24-
%if 0%{?rhel} == 8
24+
%if 0%{?rhel} < 10
2525
BuildRequires: gcc-toolset-14
2626
BuildRequires: gcc-toolset-14-gcc
2727
BuildRequires: gcc-toolset-14-gcc-c++
2828
%endif
2929

30-
%if 0%{?rhel} >= 9
31-
BuildRequires: gcc >= 10
32-
BuildRequires: gcc-c++ >= 10
33-
%endif
34-
3530
BuildRequires: make
3631
BuildRequires: cmake >= 3.12
3732
BuildRequires: libunwind-devel
@@ -101,7 +96,7 @@ Experimental process plugins.
10196
%autosetup
10297

10398
%build
104-
%if 0%{?rhel} == 8
99+
%if 0%{?rhel} < 10
105100
source /opt/rh/gcc-toolset-14/enable
106101
%endif
107102
%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}

0 commit comments

Comments
 (0)