Add -std=c++11 to the compilerflags (needed on EPEL7).
This commit is contained in:
parent
8f890a6325
commit
bf8adb66c8
13
botan.spec
13
botan.spec
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
Name: botan
|
Name: botan
|
||||||
Version: %{major_version}.14
|
Version: %{major_version}.14
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Crypto library written in C++
|
Summary: Crypto library written in C++
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
|
@ -157,17 +157,17 @@ cp -a build/python{,3}
|
||||||
%endif # with_python3
|
%endif # with_python3
|
||||||
|
|
||||||
# (ab)using CXX as an easy way to inject our CXXFLAGS
|
# (ab)using CXX as an easy way to inject our CXXFLAGS
|
||||||
make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags}
|
make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags}
|
||||||
|
|
||||||
make -f Makefile.python \
|
make -f Makefile.python \
|
||||||
CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \
|
CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \
|
||||||
PYTHON_INC="$(python2-config --includes)" \
|
PYTHON_INC="$(python2-config --includes)" \
|
||||||
PYTHON_ROOT=.
|
PYTHON_ROOT=.
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
mv build/python{,2} ; mv build/python{3,}
|
mv build/python{,2} ; mv build/python{3,}
|
||||||
make -f Makefile.python \
|
make -f Makefile.python \
|
||||||
CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \
|
CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} \
|
||||||
PYTHON_INC="$(python3-config --includes)" \
|
PYTHON_INC="$(python3-config --includes)" \
|
||||||
PYTHON_ROOT=. \
|
PYTHON_ROOT=. \
|
||||||
BOOST_PYTHON=boost_python3
|
BOOST_PYTHON=boost_python3
|
||||||
|
@ -255,7 +255,7 @@ rm -r %{buildroot}%{_pkgdocdir}/manual/{.doctrees,.buildinfo}
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check
|
make CXX="g++ -std=c++11 ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check
|
||||||
|
|
||||||
# these checks would fail
|
# these checks would fail
|
||||||
mv checks/validate.dat{,.orig}
|
mv checks/validate.dat{,.orig}
|
||||||
|
@ -265,6 +265,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Dec 10 2016 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.14-3
|
||||||
|
- Add -std=c++11 to the compilerflags (needed on EPEL7).
|
||||||
|
|
||||||
* Fri Dec 9 2016 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.14-2
|
* Fri Dec 9 2016 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.14-2
|
||||||
- Update to 1.10.14.
|
- Update to 1.10.14.
|
||||||
- Depend on OpenSSL 1.0 compat package for F26+.
|
- Depend on OpenSSL 1.0 compat package for F26+.
|
||||||
|
|
Loading…
Reference in New Issue