openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 21:24:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

libmariadb: update to 3.4.5

Browse Source 
Backport upstream patch fixing compilation with GCC 15.

Remove upstreamed patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2025-07-12 21:05:56 -07:00
committed by Tianling Shen
parent d3c5050e35
commit ac5377e031
4 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libs/libmariadb/patches/020-gcc15.patch Normal file
View File

@@ -0,0 +1,28 @@
From b10b76e5a2b983d86bd487873608abce8e0d507b Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Wed, 12 Feb 2025 15:17:39 +0100
Subject: [PATCH] Fix compilation with GCC 15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| In file included from /builddir/build/BUILD/mariadb-connector-c-3.4.3-build/mariadb-connector-c-3.4.3-src/plugins/auth/dialog.c:23:
| /builddir/build/BUILD/mariadb-connector-c-3.4.3-build/mariadb-connector-c-3.4.3-src/include/ma_global.h:687:25: error: ‘bool’ cannot be defined via ‘typedef’
| 687 | typedef char bool; /* Ordinary boolean values 0 1 */
| | ^~~~
| /builddir/build/BUILD/mariadb-connector-c-3.4.3-build/mariadb-connector-c-3.4.3-src/include/ma_global.h:687:25: note: ‘bool’ is a keyword with ‘-std=c23’ onwards
---
include/ma_global.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/include/ma_global.h
+++ b/include/ma_global.h
@@ -683,7 +683,7 @@ typedef unsigned long size_s; /* Size of
typedef int myf; /* Type of MyFlags in my_funcs */
typedef char my_bool; /* Small bool */
typedef unsigned long long my_ulonglong;
-#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
+#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) && (__STDC_VERSION__ < 202300L)
typedef char bool; /* Ordinary boolean values 0 1 */
#endif
/* Macros for converting *constants* to the right type */