Attachment 236760 Details for Bug 266227 – Proposed patch for databases/ejdb

[patch] Proposed patch for databases/ejdb

0001-databases-ejdb-unbreak-on-CURRENT-after-GNU-qsort_r.patch (text/plain), 2.17 KB, created by Xin LI on 2022-09-23 07:22:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2022-09-23 07:22:30 UTC

Size: 2.17 KB

patch

obsolete

>From 156f78114d4f46d8ee1a3c38bc0d89a8027f9f20 Mon Sep 17 00:00:00 2001
>From: Xin LI <delphij@FreeBSD.org>
>Date: Fri, 23 Sep 2022 00:20:17 -0700
>Subject: [PATCH] databases/ejdb: unbreak on -CURRENT after GNU qsort_r
>
>PR:		266227
>Reported by:	antoine (via exp-run)
>---
> databases/ejdb/files/patch-src_util_sort__r.h | 34 +++++++++++++++++++
> 1 file changed, 34 insertions(+)
> create mode 100644 databases/ejdb/files/patch-src_util_sort__r.h
>
>diff --git a/databases/ejdb/files/patch-src_util_sort__r.h b/databases/ejdb/files/patch-src_util_sort__r.h
>new file mode 100644
>index 000000000000..099d67ade3bb
>--- /dev/null
>+++ b/databases/ejdb/files/patch-src_util_sort__r.h
>@@ -0,0 +1,34 @@
>+--- src/util/sort_r.h.orig	2022-02-23 10:00:23 UTC
>++++ src/util/sort_r.h
>+@@ -25,10 +25,11 @@
>+ #define _SORT_R_INLINE inline
>+ 
>+ #if (  defined __APPLE__ || defined __MACH__ || defined __DARWIN__    \
>+-    || defined __FreeBSD__ || defined __DragonFly__) && defined JB_HAVE_QSORT_R
>++    || (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__) && defined JB_HAVE_QSORT_R
>+ #  define _SORT_R_BSD
>+ #elif (  defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__    \
>+-      || defined __linux__ || defined __MINGW32__ || defined __GLIBC__) && defined JB_HAVE_QSORT_R
>++      || defined __linux__ || defined __MINGW32__ || defined __GLIBC__ \
>++      || (defined (__FreeBSD__) && defined(qsort_r))) && defined JB_HAVE_QSORT_R
>+ #  define _SORT_R_LINUX
>+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
>+ #  define _SORT_R_WINDOWS
>+@@ -255,7 +256,7 @@ static _SORT_R_INLINE void sort_r(
>+   #if defined _SORT_R_BSD
>+ 
>+ /* Ensure qsort_r is defined */
>+-extern void qsort_r(
>++extern void (qsort_r)(
>+   void *base, size_t nel, size_t width, void *thunk,
>+   int (*compar)(void *_thunk,
>+                 const void *_a, const void *_b));
>+@@ -283,7 +284,7 @@ typedef int (*__compar_d_fn_t)(const void*, const void
>+   #if defined _SORT_R_LINUX
>+ 
>+ typedef int (*__compar_d_fn_t)(const void*, const void*, void*);
>+-extern void qsort_r(
>++extern void (qsort_r)(
>+   void *base, size_t nel, size_t width,
>+   __compar_d_fn_t __compar, void *arg)
>+ __attribute__((nonnull(1, 4)));
>-- 
>2.37.3
>

Flags:

delphij: maintainer-approval? (danfe)

Actions: View | Diff

Attachments on bug 266227: 236360 | 236386 | 236388 | 236389 | 236429 | 236470 | 236483 | 236507 | 236621 | 236638 | 236643 | 236644 | 236652 | 236678 | 236744 | 236760