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

diff --git a/mysql.spec b/mysql.spec
index 8d878a87836a0646e55b2a7eccca558270da6301..e73271ed769d90a74d47dd9f08a6464d33881f8b 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
@@ -465,6 +466,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..f784f76
--- /dev/null
+++ b/zlib.patch
@@ -0,0 +1,16 @@
+--- mysql-8.0.35/scripts/CMakeLists.txt        2023-10-12 13:45:01.000000000 +0200
++++ mysql-8.0.35/scripts/CMakeLists.txt        2024-01-10 03:05:25.295287804 +0100
+@@ -315,10 +315,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 "^\\-L")
+         # Search directory. Test on FreeBSD: -L/usr/local/lib -lunwind
+         SET(${var} "${${var}} ${lib} ")