This commit is contained in:
parent
8fa0d4716d
commit
6a07642c57
@ -318,13 +318,13 @@ BuildConflicts: java-devel < 9
|
|||||||
BuildConflicts: java-headless < 9
|
BuildConflicts: java-headless < 9
|
||||||
BuildRequires: pkgconfig(libopenjp2)
|
BuildRequires: pkgconfig(libopenjp2)
|
||||||
%endif
|
%endif
|
||||||
# Dragonbox requires gcc11
|
# Dragonbox requires C++17
|
||||||
%if 0%{?is_opensuse} || 0%{?sle_version} >= 150000
|
%if 0%{?is_opensuse} || 0%{?sle_version} >= 150000
|
||||||
BuildRequires: gcc >= 7
|
BuildRequires: gcc >= 7
|
||||||
BuildRequires: gcc-c++ >= 7
|
BuildRequires: gcc-c++ >= 7
|
||||||
%else
|
%else
|
||||||
BuildRequires: gcc11
|
BuildRequires: gcc7
|
||||||
BuildRequires: gcc11-c++
|
BuildRequires: gcc7-c++
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# needed by python3_sitelib
|
# needed by python3_sitelib
|
||||||
@ -1099,8 +1099,8 @@ CXXFLAGS="-std=c++17 $ARCH_FLAGS"
|
|||||||
export ARCH_FLAGS CFLAGS CXXFLAGS
|
export ARCH_FLAGS CFLAGS CXXFLAGS
|
||||||
|
|
||||||
%if !0%{?is_opensuse} && 0%{?sle_version} < 150000
|
%if !0%{?is_opensuse} && 0%{?sle_version} < 150000
|
||||||
export CC=gcc-11
|
export CC=gcc-7
|
||||||
export CXX=g++-11
|
export CXX=g++-7
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Fake the epoch stuff in generated zip files
|
# Fake the epoch stuff in generated zip files
|
||||||
|
Loading…
x
Reference in New Issue
Block a user