From ad8aec2d2899b6dbf64930fa83024252ec84b238 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 19 Jul 2019 17:14:50 +0200 Subject: [PATCH 1/3] Use macro for setting up the compiler flags --- galera.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/galera.spec b/galera.spec index 9220237..094d18f 100644 --- a/galera.spec +++ b/galera.spec @@ -1,6 +1,6 @@ Name: galera Version: 25.3.25 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -38,11 +38,15 @@ replication engine see http://www.codership.com. %patch0 -p1 %build -CPPFLAGS="%{optflags}" -CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" ` -export CPPFLAGS +%{set_build_flags} -scons-3 %{?_smp_mflags} strict_build_flags=0 +# FTBFS with the GLIBCXX_ASSERTIONS; #1546787 +CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" ` +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 + +scons-3 %{?_smp_mflags} strict_build_flags=1 %install @@ -88,6 +92,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Fri Jul 19 2019 Michal Schorm - 25.3.25-4 +- Use macro for setting up the compiler flags + * Thu Jan 31 2019 Fedora Release Engineering - 25.3.25-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6c2c804e77f6317b6806ba062d003e2afcc82bdd Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 19 Jul 2019 17:29:26 +0200 Subject: [PATCH 2/3] Rebase to 25.3.26 --- .gitignore | 1 + galera.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f1de323..1537e46 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /galera-25.3.22.tar.gz /galera-25.3.23.tar.gz /galera-25.3.25.tar.gz +/galera-25.3.26.tar.gz diff --git a/galera.spec b/galera.spec index 094d18f..96640c4 100644 --- a/galera.spec +++ b/galera.spec @@ -1,6 +1,6 @@ Name: galera -Version: 25.3.25 -Release: 4%{?dist} +Version: 25.3.26 +Release: 1%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -92,6 +92,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Fri Jul 19 2019 Michal Schorm - 25.3.26-1 +- Rebase to 25.3.26 + * Fri Jul 19 2019 Michal Schorm - 25.3.25-4 - Use macro for setting up the compiler flags diff --git a/sources b/sources index 37d9fae..cc8c46d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (galera-25.3.25.tar.gz) = 231f58c52437a98440bfa6d6ba05a87fbd6353fe67d4380fff7c15f759a5bd11732d30b8d58d72e0641fd2df180fcec10f88fa8282a8ca1affa3c762644b471e +SHA512 (galera-25.3.26.tar.gz) = c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4 From 4d24362666b3d2c9663d35a12b71f93faba45b0c Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sat, 20 Jul 2019 13:48:35 +0200 Subject: [PATCH 3/3] Workaround bug on F30 ppc64le --- galera.spec | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/galera.spec b/galera.spec index 96640c4..b0880a5 100644 --- a/galera.spec +++ b/galera.spec @@ -46,7 +46,23 @@ 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: +# scons-3 --help +# 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 + %install