From nobody Fri Sep 30 22:30:01 2022 X-Original-To: dev-commits-ports-main@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 4MfQ096dBrz4d2pq; Fri, 30 Sep 2022 22:30:01 +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 4MfQ093rvrz3k8F; Fri, 30 Sep 2022 22:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664577001; 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=HnblNLAkA70wB67fpT5TpjK0Pwo/mo6qxBMfXEbDXD0=; b=E+JB9xSxq8t4qRQX/ifXbc6mjestCQmqUatPt30oiyFAxfPB1Y/4nDniGDhKTTBoOpBXxM bVnBLCmCayOL6N72+NnMlscsJZjgPGm1a6GkMI0CsPhbXb3nAWrKsLkTCmMdY8itfQ4kzj QAiAF5M+/zodQNR5JToVi47yKQkjpUkfxP3Z49kyrrp3Mr0F5BBrqKI0sOpl0MCwTJVuS6 Jox56xbh/7jHZZoBa/IB9dueSc1Gj8fqzkp2Spt49oAo3jQsoZgK+E1EgKSojua0wDZDFH 4hmkV54LZM2DqyBwF+qSRmhJlHNe4zDoRhEeqkv7qFl46vlSeM+jM4UDTUFb8Q== 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 4MfQ092x4zzK5d; Fri, 30 Sep 2022 22:30:01 +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 28UMU1gW021297; Fri, 30 Sep 2022 22:30:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28UMU1EG021286; Fri, 30 Sep 2022 22:30:01 GMT (envelope-from git) Date: Fri, 30 Sep 2022 22:30:01 GMT Message-Id: <202209302230.28UMU1EG021286@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: 7df902171f69 - main - databases/ejdb: unbreak on -CURRENT after GNU qsort_r List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 7df902171f69003e364e23feefc7d15e4aa97ed4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664577001; 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=HnblNLAkA70wB67fpT5TpjK0Pwo/mo6qxBMfXEbDXD0=; b=ACAa7SPNnuoSS9SeyAfuWM37p11XL82k019i6QkAMCCXdq9xKs+ZHBtbuBonGRNeSDux37 f8t3n+icGc35BM9hMlhv0q6hYDzQ2oR9h6FZGS3kij0nxNEQ3Yd/9WwnY6WmEGQoxcW9tx 5begX6eKvg3QmtmYsDzzetXQ8rg+qux93z/CLwxRizN3HOZfACgg6Uuopx4emST3HWJloN ro22eLLggq71OfoCySzfgreI8m2wO8YLD5hy+ve51xETKM7ahIUgCbspjsEuQ+9rnqsDAs 83DtMuDV0N5RBf2isqah9oVfhzWGiipAiK3iDwf+X5IRhqfJxF0WfRd2SeUmMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664577001; a=rsa-sha256; cv=none; b=MXa+An4g5YnamyUkMEjo3DQ91RQst/BA2AWn+752AVkYOdpZdYK6Ul52LdZ0ErR1xIyXKH pdYxIZDyLcJswQm6WLrjh2ht5JWxOZXB+DyZqvGCEwcaMgH0ZYeSKBuXDtytnHRsITDmqO DDf4DPqwhtepgpoKdmvII8dJ008zvvXuVD8mexvyrX+Ah8sPX4IQQVRy6iIOTBC0jBYDI9 dd3VODubOk3/buh0b1U5oMcv+/VsagQb9NCer8UfRjJyakeKhpPbOW8tir9w9IYVZPDO4I R0wQoHK2MIxe8JCgMC3Z+VPiyPg5YKfPDqBeO4aNunc56QOeI+NmJKdLIjSHfg== 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=7df902171f69003e364e23feefc7d15e4aa97ed4 commit 7df902171f69003e364e23feefc7d15e4aa97ed4 Author: Xin LI AuthorDate: 2022-09-30 20:45:51 +0000 Commit: Xin LI CommitDate: 2022-09-30 22:28:06 +0000 databases/ejdb: unbreak on -CURRENT after GNU qsort_r PR: 266227 Exp-run by: antoine Approved by: portmgr --- databases/ejdb/files/patch-src_util_sort__r.h | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/databases/ejdb/files/patch-src_util_sort__r.h b/databases/ejdb/files/patch-src_util_sort__r.h new file mode 100644 index 000000000000..099d67ade3bb --- /dev/null +++ b/databases/ejdb/files/patch-src_util_sort__r.h @@ -0,0 +1,34 @@ +--- src/util/sort_r.h.orig 2022-02-23 10:00:23 UTC ++++ src/util/sort_r.h +@@ -25,10 +25,11 @@ + #define _SORT_R_INLINE inline + + #if ( defined __APPLE__ || defined __MACH__ || defined __DARWIN__ \ +- || defined __FreeBSD__ || defined __DragonFly__) && defined JB_HAVE_QSORT_R ++ || (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__) && defined JB_HAVE_QSORT_R + # define _SORT_R_BSD + #elif ( defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ \ +- || defined __linux__ || defined __MINGW32__ || defined __GLIBC__) && defined JB_HAVE_QSORT_R ++ || defined __linux__ || defined __MINGW32__ || defined __GLIBC__ \ ++ || (defined (__FreeBSD__) && defined(qsort_r))) && defined JB_HAVE_QSORT_R + # define _SORT_R_LINUX + #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__) + # define _SORT_R_WINDOWS +@@ -255,7 +256,7 @@ static _SORT_R_INLINE void sort_r( + #if defined _SORT_R_BSD + + /* Ensure qsort_r is defined */ +-extern void qsort_r( ++extern void (qsort_r)( + void *base, size_t nel, size_t width, void *thunk, + int (*compar)(void *_thunk, + const void *_a, const void *_b)); +@@ -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)));