Attachment 236652 Details for Bug 266227 – Proposed patch for databases/pointcloud

[patch] Proposed patch for databases/pointcloud

0001-databases-pointcloud-unbreak-on-CURRENT-after-GNU-qs.patch (text/plain), 1.96 KB, created by Xin LI on 2022-09-18 04:07:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xin LI

Created: 2022-09-18 04:07:24 UTC

Size: 1.96 KB

patch

obsolete

>From f5ba87c8219a5c9d492f996cf79e47abfb5eba2f Mon Sep 17 00:00:00 2001
>From: Xin LI <delphij@FreeBSD.org>
>Date: Sat, 17 Sep 2022 21:05:20 -0700
>Subject: [PATCH] databases/pointcloud: unbreak on -CURRENT after GNU qsort_r
>
>PR:		ports/266227
>---
> .../files/patch-lib_sort__r_sort__r.h         | 24 +++++++++++++++++++
> 1 file changed, 24 insertions(+)
> create mode 100644 databases/pointcloud/files/patch-lib_sort__r_sort__r.h
>
>diff --git a/databases/pointcloud/files/patch-lib_sort__r_sort__r.h b/databases/pointcloud/files/patch-lib_sort__r_sort__r.h
>new file mode 100644
>index 000000000000..154155cde4c0
>--- /dev/null
>+++ b/databases/pointcloud/files/patch-lib_sort__r_sort__r.h
>@@ -0,0 +1,24 @@
>+--- lib/sort_r/sort_r.h.orig	2022-09-12 07:14:10 UTC
>++++ lib/sort_r/sort_r.h
>+@@ -27,10 +27,10 @@ void sort_r(void *base, size_t nel, size_t width,
>+ #define _SORT_R_INLINE inline
>+ 
>+ #if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \
>+-     defined __FreeBSD__ || defined __DragonFly__)
>++     (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__)
>+ #  define _SORT_R_BSD
>+ #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \
>+-       defined __linux__ || (defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR) || defined __GLIBC__)
>++       defined __linux__ || (defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR) || defined __GLIBC__ || (defined (__FreeBSD__) && defined(qsort_r)))
>+ #  define _SORT_R_LINUX
>+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
>+ #  define _SORT_R_WINDOWS
>+@@ -170,7 +170,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
>

Flags:

delphij: maintainer-approval? (lbartoletti)

Actions: View | Diff

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