Merge branch 'master' into mariadb-10.3
This commit is contained in:
commit
410508386a
27
galera.spec
27
galera.spec
@ -38,14 +38,32 @@ replication engine see http://www.codership.com.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CPPFLAGS="%{optflags}"
|
%{set_build_flags}
|
||||||
|
|
||||||
|
# FTBFS with the GLIBCXX_ASSERTIONS; #1546787
|
||||||
CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
|
CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
|
||||||
export CPPFLAGS
|
CFLAGS=`echo $CFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
|
||||||
|
CXXFLAGS=`echo $CXXFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
|
||||||
|
export CPPFLAGS CFLAGS CXXFLAGS
|
||||||
|
|
||||||
# Print help:
|
# Print help:
|
||||||
# scons-3 --help
|
# scons-3 --help
|
||||||
# scons-3 -H
|
# scons-3 -H
|
||||||
|
|
||||||
|
# Possibly usefull arguments:
|
||||||
|
# --debug=findlibs
|
||||||
|
# --debug=stacktrace
|
||||||
|
# --warn=all
|
||||||
|
# debug=0
|
||||||
|
|
||||||
|
%if 0%{?fedora} == 30 && %_arch == ppc64le
|
||||||
|
# Workaround for a bug which was solved in Rawhide
|
||||||
|
scons-3 %{?_smp_mflags} strict_build_flags=0
|
||||||
|
%else
|
||||||
|
scons-3 %{?_smp_mflags} strict_build_flags=1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
# Possibly usefull arguments:
|
# Possibly usefull arguments:
|
||||||
# --debug=findlibs
|
# --debug=findlibs
|
||||||
# --debug=stacktrace
|
# --debug=stacktrace
|
||||||
@ -98,9 +116,12 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jun 12 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-1
|
* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-1
|
||||||
- Rebase to 25.3.26
|
- Rebase to 25.3.26
|
||||||
|
|
||||||
|
* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 25.3.25-4
|
||||||
|
- Use macro for setting up the compiler flags
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.3.25-3
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.3.25-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user