From 15b46299cfa22147cbfa89a732e426a89ac35a9b Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sun, 9 Jun 2024 23:00:44 +0200 Subject: [PATCH] [bundled libraries fix] The 'rapidjson' library has to be bundled. When you try to use system version of the library, following error emerges: | -- Performing Test HAVE_RAPIDJSON_WITH_STD_REGEX | -- Performing Test HAVE_RAPIDJSON_WITH_STD_REGEX - Failed | CMake Error at cmake/rapidjson.cmake:114 (MESSAGE): | System rapidjson lacks some fixes required for support of regular | expressions. See extra/RAPIDJSON-README for details. | Call Stack (most recent call first): | CMakeLists.txt:1952 (MYSQL_CHECK_RAPIDJSON) | -- Configuring incomplete, errors occurred! I specifically chose not to specify version in the bundled(rapidjson), to avoid confusion that it's the same version as of the system variant of the library from package 'rapidjson' --- mysql8.0.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql8.0.spec b/mysql8.0.spec index 7c63b05..d52aa4f 100644 --- a/mysql8.0.spec +++ b/mysql8.0.spec @@ -166,7 +166,6 @@ BuildRequires: perl-generators BuildRequires: rpcgen BuildRequires: libtirpc-devel BuildRequires: protobuf-lite-devel -BuildRequires: rapidjson-devel BuildRequires: zlib BuildRequires: zlib-devel BuildRequires: multilib-rpm-config @@ -222,6 +221,12 @@ Requires: %{pkgname}-common = %{sameevr} Provides: bundled(boost) = %{boost_bundled_version} +# 'rapidjson' library must be bundled +# The rapidjson upstream made the last release in 2016, even though it has an active development till today (2024, ~750 commits since) +# The MySQL upstream forked the project from a specific commit and added custom patches. See "extra/RAPIDJSON-README" for details. +# In the MySQL 8.0.34, the MySQL upsstream made the 'rapidjson' library to be bundled by default. +Provides: bundled(rapidjson) + %{?with_conflicts_mariadb:Conflicts: mariadb} # Explicitly disallow installation of mysql + mariadb-server %{?with_conflicts_mariadb:Conflicts: mariadb-server}