FreeBSD Bugzilla – Attachment 236483 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 sysutils/e2fsprogs
0001-sysutils-e2fsprogs-Fix-qsort_r-detection-for-POSIX-q.patch (text/plain), 2.07 KB, created by
Xin LI
on 2022-09-10 21:06:00 UTC
(
hide
)
Description:
Proposed patch for sysutils/e2fsprogs
Filename:
MIME Type:
Creator:
Xin LI
Created:
2022-09-10 21:06:00 UTC
Size:
2.07 KB
patch
obsolete
>From ec2e0d010ecbd3afe762863a8ed7a88432395903 Mon Sep 17 00:00:00 2001 >From: Xin LI <delphij@FreeBSD.org> >Date: Thu, 8 Sep 2022 00:26:29 -0700 >Subject: [PATCH] sysutils/e2fsprogs: Fix qsort_r detection for POSIX > qsort_r(3). > >--- > sysutils/e2fsprogs/Makefile | 2 +- > .../files/patch-lib_support_sort__r.h | 21 +++++++++++++++++++ > 2 files changed, 22 insertions(+), 1 deletion(-) > create mode 100644 sysutils/e2fsprogs/files/patch-lib_support_sort__r.h > >diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile >index f45b04a5762e..9a89d8de14f6 100644 >--- a/sysutils/e2fsprogs/Makefile >+++ b/sysutils/e2fsprogs/Makefile >@@ -13,7 +13,7 @@ > > PORTNAME= e2fsprogs > PORTVERSION= 1.46.5 >-PORTREVISION?= 1 >+PORTREVISION?= 2 > CATEGORIES?= sysutils > MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} > >diff --git a/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h b/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h >new file mode 100644 >index 000000000000..dec89ce8ef9a >--- /dev/null >+++ b/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h >@@ -0,0 +1,21 @@ >+--- lib/support/sort_r.h.orig 2021-12-30 05:54:33 UTC >++++ lib/support/sort_r.h >+@@ -25,7 +25,8 @@ void sort_r(void *base, size_t nel, size_t width, >+ #define _SORT_R_INLINE inline >+ >+ #if (defined __gnu_hurd__ || defined __GNU__ || \ >+- defined __linux__ || defined __MINGW32__ || defined __GLIBC__) >++ defined __linux__ || defined __MINGW32__ || defined __GLIBC__ || \ >++ defined qsort_r) >+ # define _SORT_R_LINUX >+ #elif (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \ >+ defined __FreeBSD__ || defined __DragonFly__) >+@@ -263,7 +264,7 @@ static _SORT_R_INLINE void sort_r_simple(void *base, s >+ #if defined _SORT_R_LINUX >+ >+ typedef int(* __compar_d_fn_t)(const void *, const void *, void *); >+- extern void qsort_r(void *base, size_t nel, size_t width, >++ 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?
(
mandree
)
Actions:
View
|
Diff
Attachments on
bug 266227
:
236360
|
236386
|
236388
|
236389
|
236429
|
236470
| 236483 |
236507
|
236621
|
236638
|
236643
|
236644
|
236652
|
236678
|
236744
|
236760