commit d3c9339de5fae9ef6ae15931b8b96f754b7d6504 Author: Arkadiusz MiĆkiewicz <ar...@maven.pl> Date: Thu Apr 4 10:49:41 2024 +0200
Rel 2; builds now on current th mysql-build.patch | 14 ++++++++++++++ mysql.spec | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) --- diff --git a/mysql.spec b/mysql.spec index b84bf53..9e64bd4 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %undefine with_tokudb %endif -%define rel 1 +%define rel 2 %define percona_rel 91.0 Summary: MySQL: a very fast and reliable SQL database engine Summary(de.UTF-8): MySQL: ist eine SQL-Datenbank @@ -569,9 +569,9 @@ cd build CPPFLAGS="%{rpmcppflags}" \ %cmake .. \ -DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \ - -DCMAKE_C_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \ + -DCMAKE_C_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0 -std=c++14" \ -DCMAKE_CXX_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0 -std=c++14" \ - -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0 -std=c++14" \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0 -std=c++14" \ -DCOMPILATION_COMMENT="PLD/Linux Distribution MySQL RPM" \ -DCURSES_INCLUDE_PATH=/usr/include/ncurses \ diff --git a/mysql-build.patch b/mysql-build.patch index ae10f26..f87118c 100644 --- a/mysql-build.patch +++ b/mysql-build.patch @@ -60,3 +60,17 @@ set(USE_VALGRIND OFF CACHE BOOL "whether to use valgrind headers") if (USE_VALGRIND) +--- percona-server-5.6.51-91.0/include/my_global.h~ 2021-02-02 15:20:34.000000000 +0100 ++++ percona-server-5.6.51-91.0/include/my_global.h 2024-04-04 10:20:48.289940995 +0200 +@@ -380,10 +380,7 @@ C_MODE_END + @param member Name of the member within the structure. + */ + #define my_container_of(ptr, type, member) \ +- ({ \ +- const typeof(((type *)0)->member) *__mptr= (ptr); \ +- (type *)((char *)__mptr - offsetof(type, member)); \ +- }) ++ ((type *)((char *)ptr - offsetof(type, member))) + + /* + A lot of our programs uses asserts, so better to always include it ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/d3c9339de5fae9ef6ae15931b8b96f754b7d6504 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit