[packages/mysql/MYSQL_5_7] Rel 3; fix build

arekm arekm at pld-linux.org
Tue May 26 23:30:35 CEST 2026


commit d8a2f63a82bfe1670caaa290e12ba055fd81e5d4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue May 26 23:30:15 2026 +0200

    Rel 3; fix build

 mysql-sig_return.patch | 18 ++++++++++++++++++
 mysql.spec             |  4 +++-
 2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/mysql.spec b/mysql.spec
index 44d9c4e..83649f4 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -36,7 +36,7 @@ Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.7.44
-Release:	2
+Release:	3
 License:	GPL v2 + MySQL FOSS License Exception
 Group:		Applications/Databases
 #Source0Download: https://dev.mysql.com/downloads/mysql/5.7.html#downloads
@@ -70,6 +70,7 @@ Patch5:		%{name}-chain-certs.patch
 Patch6:		%{name}-cmake.patch
 Patch7:		%{name}-readline.patch
 Patch8:		%{name}dumpslow-clusters.patch
+Patch9:		%{name}-sig_return.patch
 URL:		http://www.mysql.com/products/community/
 BuildRequires:	automake
 BuildRequires:	bison >= 1.875
@@ -482,6 +483,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 %patch -P6 -p1
 %patch -P7 -p1
 %patch -P8 -p1
+%patch -P9 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc
diff --git a/mysql-sig_return.patch b/mysql-sig_return.patch
new file mode 100644
index 0000000..ef7ffc1
--- /dev/null
+++ b/mysql-sig_return.patch
@@ -0,0 +1,18 @@
+Match sig_return to the prototype glibc's signal() actually uses.
+
+GCC 14 makes -Wincompatible-pointer-types an error by default. sig_return
+was declared with an unprototyped K&R signature, void (*)(), but it only
+ever holds the value round-tripped through signal() in my_lock.c, whose
+type is __sighandler_t == void (*)(int). Give the typedef that signature.
+
+--- mysql-5.7.44/include/my_global.h.orig
++++ mysql-5.7.44/include/my_global.h
+@@ -213,7 +213,7 @@
+ #define INVALID_SOCKET -1
+ #endif
+ C_MODE_START
+-typedef void	(*sig_return)();/* Returns type from signal */
++typedef void	(*sig_return)(int);/* Returns type from signal */
+ C_MODE_END
+ #if defined(__GNUC__)
+ typedef char	pchar;		/* Mixed prototypes can take char */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/d8a2f63a82bfe1670caaa290e12ba055fd81e5d4



More information about the pld-cvs-commit mailing list