diff options
Diffstat (limited to 'databases/mariadb100-server/files')
3 files changed, 19 insertions, 30 deletions
diff --git a/databases/mariadb100-server/files/extra-patch-MDEV-15288 b/databases/mariadb100-server/files/extra-patch-MDEV-15288 new file mode 100644 index 000000000000..895190f6bf5e --- /dev/null +++ b/databases/mariadb100-server/files/extra-patch-MDEV-15288 @@ -0,0 +1,7 @@ +--- storage/innobase/CMakeLists.txt.orig 2018-01-27 18:40:38 UTC ++++ storage/innobase/CMakeLists.txt +@@ -489,4 +489,3 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOU + MODULE_OUTPUT_NAME ha_innodb + LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT}) + +-ADD_DEPENDENCIES(innobase GenError) diff --git a/databases/mariadb100-server/files/patch-CMakeLists.txt b/databases/mariadb100-server/files/patch-CMakeLists.txt index b26684fa0622..124415c4f146 100644 --- a/databases/mariadb100-server/files/patch-CMakeLists.txt +++ b/databases/mariadb100-server/files/patch-CMakeLists.txt @@ -1,6 +1,14 @@ ---- CMakeLists.txt.orig 2017-05-20 01:04:09.000000000 +0200 -+++ CMakeLists.txt 2017-05-23 20:53:22.017238000 +0200 -@@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +--- CMakeLists.txt.orig 2018-01-27 18:40:35 UTC ++++ CMakeLists.txt +@@ -409,7 +409,6 @@ ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(support-files) + + IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) +@@ -480,6 +479,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) @@ -8,7 +16,7 @@ INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme) # MDEV-6526 these files are not installed anymore -@@ -489,6 +490,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP +@@ -489,6 +489,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake deleted file mode 100644 index 225245f3630c..000000000000 --- a/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuSetupCompiler.cmake +++ /dev/null @@ -1,26 +0,0 @@ -From c4c48e974013a1a3d62ae6b2fc9a705c3bdd1689 Mon Sep 17 00:00:00 2001 -From: Sergei Golubchik <serg@mariadb.org> -Date: Tue, 7 Mar 2017 19:21:42 +0100 -Subject: [PATCH] MDEV-11965 -Werror should not appear in released tarballs - ---- - storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -index 769bdffa5d99..c17e119d1cdc 100644 ---- storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake.orig -+++ storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake -@@ -196,9 +196,9 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL Clang) - set_cflags_if_supported(-Wcast-align) - endif () - --## always want these --set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}") --set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}") -+## 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}") - - # pick language dialect - set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}") |