cpet
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/e2fsprogs: Fix qsort_r detection for POSIX qsort_r(3). 

PR:		ports/266227
Exp-run by:	antoine
Approved by:	portmgr
This commit is contained in:
Xin LI 2022-09-30 10:02:48 -07:00
parent cd28784c67
commit 82665ce295
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/e2fsprogs/Makefile
View File

@ -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}

21
sysutils/e2fsprogs/files/patch-lib_support_sort__r.h Normal file
View File

@ -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)));