mariadb: Fix build with clang-20/trunk

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2024-09-27 17:27:02 -07:00
parent c563d3e83d
commit 5de95a5b7a
2 changed files with 27 additions and 0 deletions
+1
View File
@@ -23,6 +23,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
file://lfs64.patch \
file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
file://0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch \
"
SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20"
@@ -0,0 +1,26 @@
From 713c21880e25108bf0703433432acca58377cc7b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 27 Sep 2024 11:55:53 -0700
Subject: [PATCH] Use a lambda function as deleter prototype in unique_ptr
Fixes build with clang/libc++ 20+
Upstream-Status: Submitted [https://jira.mariadb.org/browse/MDEV-35040]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
extra/mariabackup/backup_copy.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
index a328f5e0ec7..2ab04b78bce 100644
--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
@@ -1641,7 +1641,7 @@ is_aria_log_dir_file(const datadir_node_t &node)
bool
copy_back_aria_logs(const char *dstdir)
{
- std::unique_ptr<ds_ctxt_t, void (&)(ds_ctxt_t*)>
+ std::unique_ptr<ds_ctxt_t, std::function<void(ds_ctxt_t*)>>
ds_ctxt_aria_log_dir_path(ds_create(dstdir, DS_TYPE_LOCAL), ds_destroy);
datadir_node_t node;