- fix zlib library being listed as incorrect -lzlib instead of -lz

diff --git a/mysql.spec b/mysql.spec
index 5fdde4876368a65feabed97c461c67f006bec027..b0652aa9fb2be97c50c32fad054616d53f0de297 100644 (file)
--- 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 (file)
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")