From 0e21d7319c0e8d7aaa3f49c279ccf802e5393f36 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 10 Mar 2020 09:29:49 +0100 Subject: [PATCH 1/2] Update the fix for building in the debug mode Upstream tracker: https://jira.mariadb.org/browse/MDEV-19740 --- mariadb-debug_build.patch | 28 ---------------------------- mariadb.spec | 34 ++++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 38 deletions(-) delete mode 100644 mariadb-debug_build.patch diff --git a/mariadb-debug_build.patch b/mariadb-debug_build.patch deleted file mode 100644 index e3cfc69..0000000 --- a/mariadb-debug_build.patch +++ /dev/null @@ -1,28 +0,0 @@ -Remove the '-Werror' GCC compilation flag, so the debug build compilation won't crash on random warnings. - -'-Werror' is not your friend: -https://embeddedartistry.com/blog/2017/5/3/-werror-is-not-your-friend - ---- mariadb-10.3.17/cmake/maintainer.cmake 2019-07-28 02:18:30.000000000 +0200 -+++ mariadb-10.3.17/cmake/maintainer.cmake_patched 2019-09-03 13:41:49.082088685 +0200 -@@ -33,7 +33,6 @@ SET(MY_WARNING_FLAGS - -Wnon-virtual-dtor - -Wvla - -Wwrite-strings -- -Werror - ) - - IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0") ---- mariadb-10.3.17/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake 2019-07-28 02:18:32.000000000 +0200 -+++ mariadb-10.3.17/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake_patched 2019-09-03 13:53:51.813324055 +0200 -@@ -163,8 +163,8 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL C - endif () - - ## always want these in debug builds --set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror ${CMAKE_C_FLAGS_DEBUG}") --set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror ${CMAKE_CXX_FLAGS_DEBUG}") -+set(CMAKE_C_FLAGS_DEBUG "-Wall ${CMAKE_C_FLAGS_DEBUG}") -+set(CMAKE_CXX_FLAGS_DEBUG "-Wall ${CMAKE_CXX_FLAGS_DEBUG}") - - # pick language dialect - set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}") diff --git a/mariadb.spec b/mariadb.spec index ca6c53f..14ac2d1 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -147,7 +147,7 @@ Name: mariadb Version: 10.4.12 -Release: 1%{?with_debug:.debug}%{?dist} +Release: 2%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -195,8 +195,6 @@ Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch Patch11: %{pkgnamepatch}-pcdir.patch # Patch13: Fix Spider code on armv7hl; https://jira.mariadb.org/browse/MDEV-18737 Patch13: %{pkgnamepatch}-spider_on_armv7hl.patch -# Patch14: Remove the '-Werror' flag so the debug build won't crash on random warnings -Patch14: %{pkgnamepatch}-debug_build.patch # Patch15: Add option to edit groonga's and groonga-normalizer-mysql install path Patch15: %{pkgnamepatch}-groonga.patch # Patch16: Workaround for "chown 0" with priviledges dropped to "mysql" user @@ -684,7 +682,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \; %patch10 -p1 %patch11 -p1 %patch13 -p1 -%patch14 -p1 %patch15 -p1 %patch16 -p1 @@ -766,15 +763,29 @@ CFLAGS="$CFLAGS -fPIC" %if %{with debug} # Override all optimization flags when making a debug build -CFLAGS="$CFLAGS -O0 -g" -CPPFLAGS="$CPPFLAGS -O0 -g -D_FORTIFY_SOURCE=0" -# Fix GCC flags broken by MariaDB upstream -CFLAGS="$CFLAGS -Wno-error=deprecated-copy -Wno-error=pessimizing-move -Wno-error=unused-result -Wno-error=maybe-uninitialized -Wno-error=stringop-overflow -Wno-error=sign-compare" -CPPFLAGS="$CPPFLAGS -Wno-error=deprecated-copy -Wno-error=pessimizing-move -Wno-error=unused-result -Wno-error=maybe-uninitialized -Wno-error=stringop-overflow -Wno-error=sign-compare" -%endif +# -D_FORTIFY_SOURCE requires optimizations enabled. Disable the fortify. +CFLAGS=`echo "$CFLAGS" | sed -r 's/-D_FORTIFY_SOURCE=[012]/-D_FORTIFY_SOURCE=0/'` +CFLAGS=`echo "$CFLAGS" | sed -r 's/-O[0123]//'` + +CFLAGS="$CFLAGS -O0 -g -D_FORTIFY_SOURCE=0" + +# Fixes for Fedora 32 & Rawhide (GCC 10.0): +%if 0%{?fedora} >= 32 +CFLAGS="$CFLAGS -Wno-error=class-memaccess" +%endif # f32 + +%endif # debug CXXFLAGS="$CFLAGS" CPPFLAGS="$CFLAGS" + +# CFLAGS specific "-Wno-error" +%if %{with debug} +%if 0%{?fedora} >= 32 +CFLAGS="$CFLAGS -Wno-error=enum-conversion" +%endif # f32 +%endif # debug + export CFLAGS CXXFLAGS CPPFLAGS @@ -1559,6 +1570,9 @@ fi %endif %changelog +* Tue Mar 10 2020 Michal Schorm - 10.4.12-2 +- Update the fix for building in the debug mode + * Thu Feb 06 2020 Michal Schorm - 10.4.12-1 - Rebase to 10.4.12 From 5ef66fdfa5f8e513ff015afa5c58d1d393fedaf7 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 16 Mar 2020 04:58:29 +0100 Subject: [PATCH 2/2] Rebase mariadb-connector-c git submodule to commit fbf1db6 For fix: https://jira.mariadb.org/browse/CONC-441 --- mariadb.spec | 10 ++++++++-- sources | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 14ac2d1..2af4469 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -11,7 +11,7 @@ # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run # run only "main" suite -%global last_tested_version 10.4.11 +%global last_tested_version 10.4.12 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -147,7 +147,7 @@ Name: mariadb Version: 10.4.12 -Release: 2%{?with_debug:.debug}%{?dist} +Release: 3%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -675,6 +675,8 @@ sources. # Remove JAR files that upstream puts into tarball find . -name "*.jar" -type f -exec rm --verbose -f {} \; +rm -rf libmariadb/unittest + %patch2 -p1 %patch4 -p1 %patch7 -p1 @@ -1570,6 +1572,10 @@ fi %endif %changelog +* Mon Mar 16 2020 Michal Schorm - 10.4.12-3 +- Rebase mariadb-connector-c git submodule to commit fbf1db6 + For fix: https://jira.mariadb.org/browse/CONC-441 + * Tue Mar 10 2020 Michal Schorm - 10.4.12-2 - Update the fix for building in the debug mode diff --git a/sources b/sources index e1aa5e9..5a2560f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.4.12.tar.gz) = 518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6 +SHA512 (mariadb-10.4.12.tar.gz) = f26c45bbab765c979bbdb748da10ee314c1494e2ad7df7523bf4020b5f5036c06242739c1877fa0a21defcdd27f498cfff730289486ce9ced09d5740f3594657