diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7e00b36..c5a12d8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "8.4.0" %} +{% set version = "8.4.2" %} package: name: mysql-suite @@ -6,7 +6,7 @@ package: source: url: https://cdn.mysql.com/Downloads/MySQL-8.4/mysql-{{ version }}.tar.gz - sha256: 47a5433fcdd639db836b99e1b5459c2b813cbdad23ff2b5dd4ad27f792ba918e + sha256: 5657a78dc86bf0bf2227e0b05f8de5a2c447a816a112ffa26fa70083bcbe9814 patches: - patches/0001-Make-installation-of-pdb-files-optional.patch - patches/0002-Fix-file-path-for-mysqlrouter.conf.sample-for-instal.patch diff --git a/recipe/patches/0001-Make-installation-of-pdb-files-optional.patch b/recipe/patches/0001-Make-installation-of-pdb-files-optional.patch index a60f722..8f61777 100644 --- a/recipe/patches/0001-Make-installation-of-pdb-files-optional.patch +++ b/recipe/patches/0001-Make-installation-of-pdb-files-optional.patch @@ -1,4 +1,4 @@ -From e71a7325289196cc6be3d17e42d3de2a0fe070c4 Mon Sep 17 00:00:00 2001 +From f60715807fcf0da4e9940c8890cd601b141551af Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 21 Jun 2020 13:06:08 -0400 Subject: [PATCH 01/21] Make installation of pdb files optional @@ -9,7 +9,7 @@ Subject: [PATCH 01/21] Make installation of pdb files optional 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake -index 9228442f..fdffb96c 100644 +index b0227c96bb7..ec94242f8cf 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -47,7 +47,7 @@ MACRO(INSTALL_DEBUG_SYMBOLS target) @@ -22,10 +22,10 @@ index 9228442f..fdffb96c 100644 ENDIF() ENDMACRO() diff --git a/router/cmake/Plugin.cmake b/router/cmake/Plugin.cmake -index 2c56ba0c..40211d4f 100644 +index 3b2e8384d1c..2e2d6e9f263 100644 --- a/router/cmake/Plugin.cmake +++ b/router/cmake/Plugin.cmake -@@ -154,7 +154,8 @@ FUNCTION(add_harness_plugin NAME) +@@ -158,7 +158,8 @@ FUNCTION(add_harness_plugin NAME) COMPONENT Router) INSTALL(FILES $ DESTINATION ${_option_DESTINATION} diff --git a/recipe/patches/0002-Fix-file-path-for-mysqlrouter.conf.sample-for-instal.patch b/recipe/patches/0002-Fix-file-path-for-mysqlrouter.conf.sample-for-instal.patch index 6c8d815..efe925c 100644 --- a/recipe/patches/0002-Fix-file-path-for-mysqlrouter.conf.sample-for-instal.patch +++ b/recipe/patches/0002-Fix-file-path-for-mysqlrouter.conf.sample-for-instal.patch @@ -1,4 +1,4 @@ -From 2805b5a483a5e7f657c1660e48fdcfa4003ed69a Mon Sep 17 00:00:00 2001 +From 1b86737a08f2abbb26fbf3487d858c54466c6001 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 21 Jun 2020 16:15:08 -0400 Subject: [PATCH 02/21] Fix file path for mysqlrouter.conf.sample for @@ -9,7 +9,7 @@ Subject: [PATCH 02/21] Fix file path for mysqlrouter.conf.sample for 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/WiX/router/CMakeLists.txt b/packaging/WiX/router/CMakeLists.txt -index 6e654c2d..f786f16a 100644 +index 6e654c2d12f..f786f16a628 100644 --- a/packaging/WiX/router/CMakeLists.txt +++ b/packaging/WiX/router/CMakeLists.txt @@ -45,7 +45,7 @@ MY_ADD_CUSTOM_TARGET( diff --git a/recipe/patches/0003-Allow-flags-other-than-macros-in-CPPFLAGS.patch b/recipe/patches/0003-Allow-flags-other-than-macros-in-CPPFLAGS.patch index e3fabbe..47a953d 100644 --- a/recipe/patches/0003-Allow-flags-other-than-macros-in-CPPFLAGS.patch +++ b/recipe/patches/0003-Allow-flags-other-than-macros-in-CPPFLAGS.patch @@ -1,4 +1,4 @@ -From 0f3a6bd24c59373b8b253d11cbff3c72216c90e9 Mon Sep 17 00:00:00 2001 +From d74e52fdf9df5dbe67cd3a6026a99473fb65d68b Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 22 Jun 2020 09:53:55 -0400 Subject: [PATCH 03/21] Allow flags other than macros in CPPFLAGS @@ -8,10 +8,10 @@ Subject: [PATCH 03/21] Allow flags other than macros in CPPFLAGS 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8cd3633b..f3860f42 100644 +index ce74508addf..19e7a05f427 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -651,7 +651,9 @@ ENDFOREACH() +@@ -654,7 +654,9 @@ ENDFOREACH() # Following autotools tradition, add preprocessor definitions # specified in environment variable CPPFLAGS IF(DEFINED ENV{CPPFLAGS}) diff --git a/recipe/patches/0004-Add-include-header-for-std-string.patch b/recipe/patches/0004-Add-include-header-for-std-string.patch index 27a0931..8304dd3 100644 --- a/recipe/patches/0004-Add-include-header-for-std-string.patch +++ b/recipe/patches/0004-Add-include-header-for-std-string.patch @@ -1,4 +1,4 @@ -From 158b6a53d8447c91951c6155293ad317c1c952a5 Mon Sep 17 00:00:00 2001 +From 185a23d253aa5efb79e28ddd6f8d6def87630d7a Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 19 Oct 2020 23:48:16 -0400 Subject: [PATCH 04/21] Add include header for std::string @@ -8,7 +8,7 @@ Subject: [PATCH 04/21] Add include header for std::string 1 file changed, 1 insertion(+) diff --git a/sql/create_def.cc b/sql/create_def.cc -index cb99224d..749cd507 100644 +index cb99224dc4c..749cd507151 100644 --- a/sql/create_def.cc +++ b/sql/create_def.cc @@ -69,6 +69,7 @@ diff --git a/recipe/patches/0005-Remove-forceful-injection-of-debug-info.patch b/recipe/patches/0005-Remove-forceful-injection-of-debug-info.patch index 6094c3f..98742dd 100644 --- a/recipe/patches/0005-Remove-forceful-injection-of-debug-info.patch +++ b/recipe/patches/0005-Remove-forceful-injection-of-debug-info.patch @@ -1,4 +1,4 @@ -From 2f2fde610feb9bd8b297fa1b195a2946aed02198 Mon Sep 17 00:00:00 2001 +From ac543f5ff316e57644375552d593769b2fbc3072 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Thu, 23 Jul 2020 12:56:13 -0400 Subject: [PATCH 05/21] Remove forceful injection of debug info @@ -8,7 +8,7 @@ Subject: [PATCH 05/21] Remove forceful injection of debug info 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake -index f13bbdf5..e8907687 100644 +index f13bbdf5fff..e8907687900 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -157,13 +157,13 @@ IF(MSVC) diff --git a/recipe/patches/0006-Link-libgcc-libstdc-statically-for-codgen-binaries.patch b/recipe/patches/0006-Link-libgcc-libstdc-statically-for-codgen-binaries.patch index 16b53f1..e8828ac 100644 --- a/recipe/patches/0006-Link-libgcc-libstdc-statically-for-codgen-binaries.patch +++ b/recipe/patches/0006-Link-libgcc-libstdc-statically-for-codgen-binaries.patch @@ -1,4 +1,4 @@ -From 042dcebb2654438044ed1e6932cc125d074b38f7 Mon Sep 17 00:00:00 2001 +From 5acbabf3eb3eda65eefb026a1d0b9daaf8db9b8f Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 14 Aug 2020 20:30:20 -0400 Subject: [PATCH 06/21] Link libgcc & libstdc++ statically for codgen binaries @@ -9,7 +9,7 @@ Makes it easier for cross compilation 1 file changed, 13 insertions(+) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index 843276cb..8d9f2060 100644 +index fce0e979876..544f5d02b63 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -71,6 +71,10 @@ MYSQL_ADD_EXECUTABLE(gen_lex_token @@ -35,7 +35,7 @@ index 843276cb..8d9f2060 100644 IF(WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO) TARGET_COMPILE_OPTIONS(gen_keyword_list PRIVATE "-fno-lto") -@@ -1384,6 +1393,10 @@ SET_SOURCE_FILES_PROPERTIES( +@@ -1393,6 +1402,10 @@ SET_SOURCE_FILES_PROPERTIES( # Gen_lex_hash MYSQL_ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc SKIP_INSTALL) diff --git a/recipe/patches/0007-Add-dependency-on-comp_err-iff-that-target-exists.patch b/recipe/patches/0007-Add-dependency-on-comp_err-iff-that-target-exists.patch index 0a69f1c..70a17c1 100644 --- a/recipe/patches/0007-Add-dependency-on-comp_err-iff-that-target-exists.patch +++ b/recipe/patches/0007-Add-dependency-on-comp_err-iff-that-target-exists.patch @@ -1,4 +1,4 @@ -From ccd185efcfa666e8e411469992b71bd4297c0707 Mon Sep 17 00:00:00 2001 +From dad5f95b878394b7b1888c011f035b3e0e754c54 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 30 Jan 2021 19:48:42 -0500 Subject: [PATCH 07/21] Add dependency on comp_err iff that target exists @@ -9,7 +9,7 @@ It's not built if we are cross compiling 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt -index d38157e0..cba8c6b7 100644 +index d38157e00a4..cba8c6b77ad 100644 --- a/utilities/CMakeLists.txt +++ b/utilities/CMakeLists.txt @@ -112,7 +112,9 @@ ADD_DEFINITIONS(-DMUTEX_EVENT) diff --git a/recipe/patches/0008-Add-constructor-s-for-ut-Location.patch b/recipe/patches/0008-Add-constructor-s-for-ut-Location.patch index 6039bfb..01f86d0 100644 --- a/recipe/patches/0008-Add-constructor-s-for-ut-Location.patch +++ b/recipe/patches/0008-Add-constructor-s-for-ut-Location.patch @@ -1,4 +1,4 @@ -From d5f070b701cede09e48167891cb530d659497e2c Mon Sep 17 00:00:00 2001 +From 0d97f0b3a31ab859b9e16a165345864aa4af95bc Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Thu, 22 Apr 2021 09:32:37 -0400 Subject: [PATCH 08/21] Add constructor(s) for ut::Location @@ -13,7 +13,7 @@ dict0dict.h(1203): note: This diagnostic occurred in the compiler generated func 1 file changed, 2 insertions(+) diff --git a/storage/innobase/include/ut0core.h b/storage/innobase/include/ut0core.h -index 8bb5e26a..e4a01b7c 100644 +index 8bb5e26adfb..e4a01b7c9b8 100644 --- a/storage/innobase/include/ut0core.h +++ b/storage/innobase/include/ut0core.h @@ -34,6 +34,8 @@ diff --git a/recipe/patches/0009-Reduce-number-of-symbols-being-exported-from-mysqld..patch b/recipe/patches/0009-Reduce-number-of-symbols-being-exported-from-mysqld..patch index d663df0..c051fc4 100644 --- a/recipe/patches/0009-Reduce-number-of-symbols-being-exported-from-mysqld..patch +++ b/recipe/patches/0009-Reduce-number-of-symbols-being-exported-from-mysqld..patch @@ -1,4 +1,4 @@ -From c763cb34d111f154a87862a6fb032d08e809f3ba Mon Sep 17 00:00:00 2001 +From 4b218b79978527bfbdd41956853748f0e690acf9 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 9 May 2021 17:29:26 -0400 Subject: [PATCH 09/21] Reduce number of symbols being exported from mysqld.exe @@ -18,7 +18,7 @@ which is < 65535. 1 file changed, 14 insertions(+) diff --git a/sql/create_def.cc b/sql/create_def.cc -index 749cd507..b376202d 100644 +index 749cd507151..b376202d0dc 100644 --- a/sql/create_def.cc +++ b/sql/create_def.cc @@ -333,6 +333,12 @@ void Unique_symbol_map::insert(const std::string &symbol_line) { diff --git a/recipe/patches/0010-Ensure-sql_main-uses-protobuf-shared-library-correct.patch b/recipe/patches/0010-Ensure-sql_main-uses-protobuf-shared-library-correct.patch index 9bbe346..803bca8 100644 --- a/recipe/patches/0010-Ensure-sql_main-uses-protobuf-shared-library-correct.patch +++ b/recipe/patches/0010-Ensure-sql_main-uses-protobuf-shared-library-correct.patch @@ -1,4 +1,4 @@ -From 8f4a4d5fb3980b2f578416c819e3bf5b38a0c542 Mon Sep 17 00:00:00 2001 +From 4fffd07c50a5bb20f6e687c3cbf22a87d4e0218a Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 12 Oct 2021 07:53:59 -0400 Subject: [PATCH 10/21] Ensure sql_main uses protobuf shared library correctly @@ -8,7 +8,7 @@ Subject: [PATCH 10/21] Ensure sql_main uses protobuf shared library correctly 1 file changed, 1 insertion(+) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index 8d9f2060..d492189c 100644 +index 544f5d02b63..418e8e29d61 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -981,6 +981,7 @@ TARGET_LINK_LIBRARIES(sql_main ${MYSQLD_STATIC_PLUGIN_LIBS} diff --git a/recipe/patches/0011-Include-missing-header-for-std-isdigit.patch b/recipe/patches/0011-Include-missing-header-for-std-isdigit.patch index fca2f07..ff7867b 100644 --- a/recipe/patches/0011-Include-missing-header-for-std-isdigit.patch +++ b/recipe/patches/0011-Include-missing-header-for-std-isdigit.patch @@ -1,4 +1,4 @@ -From a914b15d045ff0ba3703919931aec40f117f8f87 Mon Sep 17 00:00:00 2001 +From feb1209f7e3965475ce8e174dab74a3f3611da3d Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Wed, 21 Jul 2021 00:55:54 +0530 Subject: [PATCH 11/21] Include missing header for std::isdigit() @@ -13,7 +13,7 @@ This patch resolves the following error with the MSVC compiler: 1 file changed, 2 insertions(+) diff --git a/sql/server_component/clone_protocol_service.cc b/sql/server_component/clone_protocol_service.cc -index f813e842..2e4b32f5 100644 +index f813e84206a..2e4b32f59c3 100644 --- a/sql/server_component/clone_protocol_service.cc +++ b/sql/server_component/clone_protocol_service.cc @@ -42,6 +42,8 @@ diff --git a/recipe/patches/0012-Print-number-of-lines-in-the-file-generated-by-creat.patch b/recipe/patches/0012-Print-number-of-lines-in-the-file-generated-by-creat.patch index b65d11c..ce43ac2 100644 --- a/recipe/patches/0012-Print-number-of-lines-in-the-file-generated-by-creat.patch +++ b/recipe/patches/0012-Print-number-of-lines-in-the-file-generated-by-creat.patch @@ -1,4 +1,4 @@ -From 42b112b25127ddd3ae2f3147c01610a25235a444 Mon Sep 17 00:00:00 2001 +From 9c9fd85e830c2d259ee76a1af77deb5d5a951f62 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 23 Oct 2021 10:31:04 -0400 Subject: [PATCH 12/21] Print number of lines in the file generated by @@ -9,10 +9,10 @@ Subject: [PATCH 12/21] Print number of lines in the file generated by 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index d492189c..601e4d7c 100644 +index 418e8e29d61..9b18a389077 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -1283,7 +1283,8 @@ IF(MSVC) +@@ -1292,7 +1292,8 @@ IF(MSVC) DEPENDS create_def binlog mysql_binlog_event mysys mytime rpl rpl_replica sql_main strings vio ) MY_ADD_CUSTOM_TARGET(GenMysqldDef ALL diff --git a/recipe/patches/0013-Check-for-ARMv8-crc32-intrinsic-support-on-osx-arm64.patch b/recipe/patches/0013-Check-for-ARMv8-crc32-intrinsic-support-on-osx-arm64.patch index d5da5aa..55434e8 100644 --- a/recipe/patches/0013-Check-for-ARMv8-crc32-intrinsic-support-on-osx-arm64.patch +++ b/recipe/patches/0013-Check-for-ARMv8-crc32-intrinsic-support-on-osx-arm64.patch @@ -1,4 +1,4 @@ -From d9e82bdb9e6c534d23dd6dcc32d915f0fbd3b6b2 Mon Sep 17 00:00:00 2001 +From 92363a0a5212688b6bca0cf8ecf42010a67c45c5 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 24 Oct 2021 14:20:06 -0400 Subject: [PATCH 13/21] Check for ARMv8 crc32 intrinsic support on osx-arm64 @@ -10,7 +10,7 @@ Subject: [PATCH 13/21] Check for ARMv8 crc32 intrinsic support on osx-arm64 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/configure.cmake b/configure.cmake -index 04921f12..41d9dca2 100644 +index 04921f125a6..41d9dca2599 100644 --- a/configure.cmake +++ b/configure.cmake @@ -693,8 +693,8 @@ IF(HAVE_LIBNUMA AND NOT WITH_NUMA) @@ -25,7 +25,7 @@ index 04921f12..41d9dca2 100644 IF (HAVE_ACLE_H) diff --git a/include/my_checksum.h b/include/my_checksum.h -index 326bf990..5d19dcc8 100644 +index 326bf9900d3..5d19dcc80ff 100644 --- a/include/my_checksum.h +++ b/include/my_checksum.h @@ -42,31 +42,39 @@ diff --git a/recipe/patches/0014-Revert-Bug-30981914-COMPILE-WITH-FASTER-TLS-MODEL.patch b/recipe/patches/0014-Revert-Bug-30981914-COMPILE-WITH-FASTER-TLS-MODEL.patch index 34454fe..c05ff71 100644 --- a/recipe/patches/0014-Revert-Bug-30981914-COMPILE-WITH-FASTER-TLS-MODEL.patch +++ b/recipe/patches/0014-Revert-Bug-30981914-COMPILE-WITH-FASTER-TLS-MODEL.patch @@ -1,4 +1,4 @@ -From 841c349a165691fb6518f0fce0d4b9c97641be04 Mon Sep 17 00:00:00 2001 +From 6e83739d350c756bbd16cd033f2c612aab2e9799 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 18 Dec 2021 16:57:08 -0500 Subject: [PATCH 14/21] Revert "Bug #30981914: COMPILE WITH FASTER TLS MODEL" @@ -12,7 +12,7 @@ This reverts commit 735bd2a53834266c7256830c8d34672ea55fe17b. 1 file changed, 9 deletions(-) diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake -index e191e9f8..0e331ee4 100644 +index e191e9f806c..0e331ee46f3 100644 --- a/cmake/build_configurations/compiler_options.cmake +++ b/cmake/build_configurations/compiler_options.cmake @@ -65,15 +65,6 @@ IF(UNIX) diff --git a/recipe/patches/0015-Zlib-module-use-macro-instead-of-function.patch b/recipe/patches/0015-Zlib-module-use-macro-instead-of-function.patch index 0b80f43..4b39085 100644 --- a/recipe/patches/0015-Zlib-module-use-macro-instead-of-function.patch +++ b/recipe/patches/0015-Zlib-module-use-macro-instead-of-function.patch @@ -1,4 +1,4 @@ -From f95f9f457eb00b0e05cd2e8a28456ae037b41c27 Mon Sep 17 00:00:00 2001 +From e89ac68dee0dcd96a8b45286f15fcc2ad9be367e Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Thu, 27 Apr 2023 11:53:31 +0530 Subject: [PATCH 15/21] Zlib module: use macro instead of function @@ -9,7 +9,7 @@ Variables set by find_package() are not globally scoped 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake -index 364483ed..c9101ba1 100644 +index 364483ed826..c9101ba1f85 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -51,7 +51,7 @@ FUNCTION(FIND_ZLIB_VERSION ZLIB_INCLUDE_DIR) diff --git a/recipe/patches/0016-Make-get_relative_path-binary-patching-friendly.patch b/recipe/patches/0016-Make-get_relative_path-binary-patching-friendly.patch index bd2fdb6..4d7c8ee 100644 --- a/recipe/patches/0016-Make-get_relative_path-binary-patching-friendly.patch +++ b/recipe/patches/0016-Make-get_relative_path-binary-patching-friendly.patch @@ -1,4 +1,4 @@ -From 3cf16291c7ec5cc0d3864e9a9fb200060ebb8431 Mon Sep 17 00:00:00 2001 +From 2fcd188f46999359119b4bd3df0d29bd5d7865c3 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 18 Jun 2023 23:44:06 +0100 Subject: [PATCH 16/21] Make get_relative_path() binary patching friendly @@ -9,10 +9,10 @@ The call to strlen() can be optimized away by the compiler 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc -index 094863f3..9f5bb2c0 100644 +index a6ef7b135e4..683b1286db9 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc -@@ -12785,9 +12785,12 @@ static void set_server_version(void) { +@@ -12798,9 +12798,12 @@ static void set_server_version(void) { } static const char *get_relative_path(const char *path) { diff --git a/recipe/patches/0017-Revert-BUG-34849343-Aligned_atomic-not-working-as-in.patch b/recipe/patches/0017-Revert-BUG-34849343-Aligned_atomic-not-working-as-in.patch index 0ae950c..8af660f 100644 --- a/recipe/patches/0017-Revert-BUG-34849343-Aligned_atomic-not-working-as-in.patch +++ b/recipe/patches/0017-Revert-BUG-34849343-Aligned_atomic-not-working-as-in.patch @@ -1,4 +1,4 @@ -From 97cdaa787cf15227551e84919b9b9abca36c0c34 Mon Sep 17 00:00:00 2001 +From 5a68044b3ae48bc01f388204a6b1c1f15b659e48 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 18 Jun 2023 15:40:42 +0100 Subject: [PATCH 17/21] Revert "BUG#34849343 Aligned_atomic not working as @@ -11,7 +11,7 @@ This reverts commit be8348a7c3e8510b998a063065b626a459631b32. 2 files changed, 18 insertions(+), 54 deletions(-) diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt -index 40434ad7..da3ec275 100644 +index abc496095a4..adac1ef9e9f 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -56,7 +56,6 @@ SET(MYSYS_SOURCES @@ -23,7 +23,7 @@ index 40434ad7..da3ec275 100644 my_bitmap.cc my_chmod.cc diff --git a/sql/memory/aligned_atomic.h b/sql/memory/aligned_atomic.h -index 17372edd..ab1666ca 100644 +index 17372edd969..ab1666cafe6 100644 --- a/sql/memory/aligned_atomic.h +++ b/sql/memory/aligned_atomic.h @@ -39,9 +39,8 @@ diff --git a/recipe/patches/0018-Make-libfido-checks-conditional.patch b/recipe/patches/0018-Make-libfido-checks-conditional.patch index 823e56f..f5e1033 100644 --- a/recipe/patches/0018-Make-libfido-checks-conditional.patch +++ b/recipe/patches/0018-Make-libfido-checks-conditional.patch @@ -1,4 +1,4 @@ -From c9c699e7620b6bf1da72d54629ce4e4d0f2f069e Mon Sep 17 00:00:00 2001 +From 585a00f071e2dc0e56bd2fa6760d599cc860f8dc Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 19 Jun 2023 20:25:57 +0100 Subject: [PATCH 18/21] Make libfido checks conditional @@ -8,10 +8,10 @@ Subject: [PATCH 18/21] Make libfido checks conditional 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f3860f42..4f3ff71f 100644 +index 19e7a05f427..30a44a102d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1934,8 +1934,10 @@ ENDIF() +@@ -1943,8 +1943,10 @@ ENDIF() MYSQL_CHECK_RAPIDJSON() # Look for fido2 library diff --git a/recipe/patches/0019-Don-t-include-headers-from-Homebrew.patch b/recipe/patches/0019-Don-t-include-headers-from-Homebrew.patch index 05bddbb..044b209 100644 --- a/recipe/patches/0019-Don-t-include-headers-from-Homebrew.patch +++ b/recipe/patches/0019-Don-t-include-headers-from-Homebrew.patch @@ -1,21 +1,21 @@ -From b5e920c53d2216e4707114b2e4d23937a6b2fbfb Mon Sep 17 00:00:00 2001 +From 46eabe57d31b12368198a8b508f05d7f165043cc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 21 Feb 2024 16:30:32 +0100 Subject: [PATCH 19/21] Don't include headers from Homebrew --- - CMakeLists.txt | 34 ---------------------------------- + CMakeLists.txt | 36 ------------------------------------ cmake/bison.cmake | 22 ---------------------- cmake/fido2.cmake | 2 -- cmake/icu.cmake | 6 ------ cmake/ssl.cmake | 17 ----------------- - 5 files changed, 81 deletions(-) + 5 files changed, 83 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f3ff71f..74f091ad 100644 +index 30a44a102d0..148c8cc00b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1684,15 +1684,6 @@ SET(SYSTEM_LIBRARIES +@@ -1691,17 +1691,6 @@ SET(SYSTEM_LIBRARIES ZLIB # Xcode ) @@ -26,12 +26,14 @@ index 4f3ff71f..74f091ad 100644 - ELSE() - SET(HOMEBREW_HOME "/usr/local/opt") - ENDIF() +- # The Xcode version is 1.2.12 which is too old +- LIST(REMOVE_ITEM SYSTEM_LIBRARIES ZLIB) -ENDIF() - SET(WITH_SYSTEM_LIBS_DEFAULT OFF) OPTION(WITH_SYSTEM_LIBS "Use -DWITH_XXX=system for ${SYSTEM_LIBRARIES}" ${WITH_SYSTEM_LIBS_DEFAULT}) -@@ -1939,31 +1930,6 @@ IF(WITH_AUTHENTICATION_CLIENT_PLUGINS) +@@ -1948,31 +1937,6 @@ IF(WITH_AUTHENTICATION_CLIENT_PLUGINS) MYSQL_CHECK_FIDO_DLLS() ENDIF() @@ -64,7 +66,7 @@ index 4f3ff71f..74f091ad 100644 WITH_AUTHENTICATION_CLIENT_PLUGINS) IF(WITH_FIDO STREQUAL "system" AND diff --git a/cmake/bison.cmake b/cmake/bison.cmake -index 854a98f3..e4c1e3e4 100644 +index 854a98f36f5..e4c1e3e47a0 100644 --- a/cmake/bison.cmake +++ b/cmake/bison.cmake @@ -56,28 +56,6 @@ IF(APPLE AND NOT DEFINED BISON_EXECUTABLE) @@ -97,7 +99,7 @@ index 854a98f3..e4c1e3e4 100644 # https://github.com/lexxmark/winflexbison/releases # or diff --git a/cmake/fido2.cmake b/cmake/fido2.cmake -index c96a57a7..4db7338f 100644 +index c96a57a76ae..4db7338f523 100644 --- a/cmake/fido2.cmake +++ b/cmake/fido2.cmake @@ -122,8 +122,6 @@ ENDFUNCTION(WARN_MISSING_SYSTEM_FIDO) @@ -110,7 +112,7 @@ index c96a57a7..4db7338f 100644 ) ENDIF() diff --git a/cmake/icu.cmake b/cmake/icu.cmake -index 66c4355a..c5cd4df3 100644 +index 66c4355ae93..c5cd4df338e 100644 --- a/cmake/icu.cmake +++ b/cmake/icu.cmake @@ -73,12 +73,6 @@ FUNCTION(FIND_ICU install_root) @@ -127,7 +129,7 @@ index 66c4355a..c5cd4df3 100644 SET(EXTRA_FIND_LIB_ARGS HINTS "${install_root}" PATH_SUFFIXES "lib" "lib64" NO_DEFAULT_PATH) diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake -index 932659d0..dd275008 100644 +index 932659d030f..dd275008581 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -350,21 +350,9 @@ ENDFUNCTION(FIND_ALTERNATIVE_SYSTEM_SSL) diff --git a/recipe/patches/0020-Use-config-mode-search-for-protobuf-first.patch b/recipe/patches/0020-Use-config-mode-search-for-protobuf-first.patch index 07cb504..2f30938 100644 --- a/recipe/patches/0020-Use-config-mode-search-for-protobuf-first.patch +++ b/recipe/patches/0020-Use-config-mode-search-for-protobuf-first.patch @@ -1,4 +1,4 @@ -From e3187330327e3c039269ef49782bc0b3be9d9447 Mon Sep 17 00:00:00 2001 +From f9a1baeb7a836b9e64d43baf21f5914373c62870 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 11 Jun 2023 23:26:01 +0100 Subject: [PATCH 20/21] Use config mode search for protobuf first @@ -13,7 +13,7 @@ See also: https://gitlab.kitware.com/cmake/cmake/-/issues/24321 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake -index c0e20c52..e4d0bf2a 100644 +index c0e20c52e5a..e4d0bf2a551 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake @@ -121,7 +121,22 @@ MACRO(MYSQL_CHECK_PROTOBUF) diff --git a/recipe/patches/0021-Simplify-protobuf-deps-using-cmake-alias.patch b/recipe/patches/0021-Simplify-protobuf-deps-using-cmake-alias.patch index 2250aed..a94ea89 100644 --- a/recipe/patches/0021-Simplify-protobuf-deps-using-cmake-alias.patch +++ b/recipe/patches/0021-Simplify-protobuf-deps-using-cmake-alias.patch @@ -1,4 +1,4 @@ -From 0501fddd7263842f6c3cacc0637883f5ae9d4b11 Mon Sep 17 00:00:00 2001 +From 5eede58c8dd0a68887b33df27b99050ee1730b5f Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Wed, 7 Aug 2024 12:25:14 +0100 Subject: [PATCH 21/21] Simplify protobuf deps using cmake alias @@ -8,7 +8,7 @@ Subject: [PATCH 21/21] Simplify protobuf deps using cmake alias 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake -index e4d0bf2a..8d5e85b6 100644 +index e4d0bf2a551..8d5e85b6deb 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake @@ -163,55 +163,12 @@ MACRO(MYSQL_CHECK_PROTOBUF)