This commit is contained in:
parent
db1e9dba6d
commit
0fe4157663
@ -99,6 +99,9 @@
|
||||
%global package_version %{featurever}.%{interimver}.%{?updatever:%{updatever}}%{!?updatever:0}.%{?patchver:%{patchver}}%{!?patchver:0}~%{buildver}
|
||||
%endif
|
||||
%global NSS_LIBDIR %(pkg-config --variable=libdir nss)
|
||||
%if 0%{?gcc_version} < 7
|
||||
%global with_gcc 7
|
||||
%endif
|
||||
%bcond_with zero
|
||||
%if ! %{with zero}
|
||||
%global with_systemtap 1
|
||||
@ -179,6 +182,8 @@ BuildRequires: desktop-file-utils
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: gcc%{?with_gcc}
|
||||
BuildRequires: gcc%{?with_gcc}-c++
|
||||
BuildRequires: giflib-devel
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: java-ca-certificates
|
||||
@ -232,13 +237,6 @@ Provides: jre1.7.x
|
||||
Provides: jre1.8.x
|
||||
Provides: jre1.9.x
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1500
|
||||
BuildRequires: gcc7
|
||||
BuildRequires: gcc7-c++
|
||||
%else
|
||||
BuildRequires: gcc >= 7
|
||||
BuildRequires: gcc-c++ >= 7
|
||||
%endif
|
||||
%if %{with_system_lcms}
|
||||
BuildRequires: liblcms2-devel
|
||||
%endif
|
||||
@ -452,11 +450,11 @@ mkdir -p %{buildoutputdir}
|
||||
pushd %{buildoutputdir}
|
||||
|
||||
bash ../configure \
|
||||
%if 0%{?suse_version} < 1500
|
||||
CPP=cpp-7 \
|
||||
CXX=g++-7 \
|
||||
CC=gcc-7 \
|
||||
NM=gcc-nm-7 \
|
||||
%if 0%{?with_gcc}
|
||||
CPP="cpp-%{with_gcc}" \
|
||||
CXX="g++-%{with_gcc}" \
|
||||
CC="gcc-%{with_gcc}" \
|
||||
NM="gcc-nm-%{with_gcc}" \
|
||||
%endif
|
||||
%if %{is_release}
|
||||
--with-version-pre="" \
|
||||
|
Loading…
x
Reference in New Issue
Block a user