From nobody Fri Sep 30 22:30:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MfQ083ntYz4d2sh; Fri, 30 Sep 2022 22:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MfQ083Ms3z3kK9; Fri, 30 Sep 2022 22:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664577000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfEleuyyc6jubkYs1Y34q/8rv8ggxiobmhBs5XqL+6M=; b=MMqlN+ShqJnE+vhhpsZ//FsLUjC0SYLCqd4I3gWRb8MvKn9N0PowN4pNIvfRDckZmw9vhc rM8XASL6UywdBCeqZv/V2rzxtTThKA//dcprhB6EaVbGeJAMC9z6Jd4u/yPhXAWbThajn/ MSAyAuqG0uBvj5c1A//d1n38wAZLa1HvjTg2BWw+o0MS83TaKXqzu4XRKpxUKTqCu36EKe VApou/1jFWrCTsXUiXUHMIHDIKv8CFGTisCW1bz+Dsccnp4rIiPvSlMdpY1LSwXngxCcx2 DfvyywIuN1Z467XE7Q0JrkzZYLin7PU012aj1vqGkucV9OqLUGxKPge5KP7XIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MfQ082TtpzK8Q; Fri, 30 Sep 2022 22:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28UMU0B3020034; Fri, 30 Sep 2022 22:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28UMU0UP020023; Fri, 30 Sep 2022 22:30:00 GMT (envelope-from git) Date: Fri, 30 Sep 2022 22:30:00 GMT Message-Id: <202209302230.28UMU0UP020023@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: 638b276a416a - main - databases/pointcloud: unbreak on -CURRENT after GNU qsort_r List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 638b276a416a4a744d51553ec986729ab035e711 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664577000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfEleuyyc6jubkYs1Y34q/8rv8ggxiobmhBs5XqL+6M=; b=Ww5euJ7bugw0Wz5g4owtQTurwNp9Oxxakdkqo7sJ0+VoHk644sQL/ha+Cx7T+86yhoXPN/ lRTwMyh8vWy/9Gugb9xFcz1NKJo8QHcfaTcKCXLELsrSoYae8aGNCrZ349EyDzsPq/esIH p/7UkzTcOR5ZoGG1YoVX7VEMELH21OQfxhNxAYbMBeSjlJmhcUNEODqd+q1TRMjSwR8Mza TrWwqPqK4ysUF2OjJhRSY3Jdy+++1DNSKeS5Ym4YR8OrzU+2yvwWmXPBuMOIhV08n34v/5 DuyFAsNfBeLk3O9lnlicerwySf1I1COQMFqELB7hj6s4kxzyjukx7V3CZholPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664577000; a=rsa-sha256; cv=none; b=tGLVoGud6tnSpczNUT9oyTSR6c2GY/NAonlo3k8BwXcEIw8xh5sudNpPLuw0iz//wvDfIx +ErvPkV7JvtaLNHWnQ2k1jtI8if/W+7zc+NJdF6Unf6pCb7K8k1pix8ok/iIB7ih/FmsBN mWNSG6ru2JrABP3mgoUZwjrkEeVqR/AZTsmu2mv/k3IegWK1OynLwFty1UySazoyoRI3in woExPyxmBx+d8HU23fZwUXZzA0uTII8Q6W6NpHwKaC5OJ1iTfBtpEs5lgyLX5XkFf6XPOE Aec8VRxwc6YA8jOfKFhyv1JwmsG19u5rVtRVVS7UGzlloxqkae5sVy58RS+1Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=638b276a416a4a744d51553ec986729ab035e711 commit 638b276a416a4a744d51553ec986729ab035e711 Author: Xin LI AuthorDate: 2022-09-30 20:42:53 +0000 Commit: Xin LI CommitDate: 2022-09-30 22:28:05 +0000 databases/pointcloud: unbreak on -CURRENT after GNU qsort_r PR: ports/266227 Exp-run by: antoine Approved by: portmgr --- .../pointcloud/files/patch-lib_sort__r_sort__r.h | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) 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))); +