FreeBSD Bugzilla – Attachment 236644 Details for
Bug 266227
[exp-run] Request for exp-run with qsort_r API change
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch for databases/iowow
0001-databases-iowow-unbreak-on-CURRENT-after-GNU-qsort_r.patch (text/plain), 1.85 KB, created by
Xin LI
on 2022-09-17 20:25:50 UTC
(
hide
)
Description:
Proposed patch for databases/iowow
Filename:
MIME Type:
Creator:
Xin LI
Created:
2022-09-17 20:25:50 UTC
Size:
1.85 KB
patch
obsolete
>From 14c514d021608816e856620aa1a2e5c80f06af87 Mon Sep 17 00:00:00 2001 >From: Xin LI <delphij@FreeBSD.org> >Date: Sat, 17 Sep 2022 13:24:28 -0700 >Subject: [PATCH] databases/iowow: unbreak on -CURRENT after GNU qsort_r > >PR: ports/266227 >--- > .../iowow/files/patch-src_utils_sort__r.h | 25 +++++++++++++++++++ > 1 file changed, 25 insertions(+) > create mode 100644 databases/iowow/files/patch-src_utils_sort__r.h > >diff --git a/databases/iowow/files/patch-src_utils_sort__r.h b/databases/iowow/files/patch-src_utils_sort__r.h >new file mode 100644 >index 000000000000..3577a97bf4cc >--- /dev/null >+++ b/databases/iowow/files/patch-src_utils_sort__r.h >@@ -0,0 +1,25 @@ >+--- src/utils/sort_r.h.orig 2022-02-14 12:24:37 UTC >++++ src/utils/sort_r.h >+@@ -25,10 +25,11 @@ >+ #define _SORT_R_INLINE inline >+ >+ #if ( defined __APPLE__ || defined __MACH__ || defined __DARWIN__ \ >+- || defined __FreeBSD__ || defined __DragonFly__) && defined IW_HAVE_QSORT_R >++ || (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__) && defined IW_HAVE_QSORT_R >+ # define _SORT_R_BSD >+ #elif ( defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ \ >+- || defined __linux__ || defined __MINGW32__ || defined __GLIBC__) && defined IW_HAVE_QSORT_R >++ || defined __linux__ || defined __MINGW32__ || defined __GLIBC__ \ >++ || (defined (__FreeBSD__) && defined(qsort_r))) && defined IW_HAVE_QSORT_R >+ # define _SORT_R_LINUX >+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__) >+ # define _SORT_R_WINDOWS >+@@ -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 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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