From 5672744936f5b3c15edbd71ec3ae6c1acc1617e0 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 10 Jan 2024 03:02:33 +0100 Subject: [PATCH] - fix zlib library being listed as incorrect -lzlib instead of -lz --- mysql.spec | 2 ++ zlib.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 zlib.patch diff --git a/mysql.spec b/mysql.spec index 5fdde48..b0652aa 100644 --- a/mysql.spec +++ b/mysql.spec @@ -52,6 +52,7 @@ Source13: mysql-client.conf Source14: my.cnf Patch0: no_relative_paths.patch Patch1: mysql-system-xxhash.patch +Patch2: zlib.patch Patch17: mysql-5.7-sphinx.patch Patch18: mysql-sphinx.patch @@ -467,6 +468,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC. %patch0 -p1 %patch1 -p1 +%patch2 -p1 %if %{with sphinx} # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51 diff --git a/zlib.patch b/zlib.patch new file mode 100644 index 0000000..e64d96a --- /dev/null +++ b/zlib.patch @@ -0,0 +1,16 @@ +--- mysql-8.2.0/scripts/CMakeLists.txt 2023-10-12 13:40:36.000000000 +0200 ++++ mysql-8.2.0/scripts/CMakeLists.txt 2024-01-10 02:46:32.077847125 +0100 +@@ -314,10 +314,12 @@ + FOREACH(lib ${TARGET_LIB_DEPENDS}) + IF (lib MATCHES "^\\-l") + SET(${var} "${${var}} ${lib} ") +- ELSEIF (lib MATCHES "^ext::") ++ ELSEIF (lib MATCHES "^ext::" AND NOT lib MATCHES "^ext::zlib") + STRING(REGEX MATCH "ext::([a-z]+)" MATCH_LIB "${lib}") + SET(SYSTEM_LIB ${CMAKE_MATCH_1}) + SET(${var} "${${var}} -l${SYSTEM_LIB} ") ++ ELSEIF(lib MATCHES "ext::zlib") ++ SET(${var} "${${var}} -lz ") + ELSEIF(lib MATCHES "OpenSSL::SSL") + SET(${var} "${${var}} -lssl ") + ELSEIF(lib MATCHES "OpenSSL::Crypto") -- 2.46.0