From nobody Fri Sep 30 22:29:59 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 4MfQ072ywDz4d2dX; Fri, 30 Sep 2022 22:29:59 +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 4MfQ072Y1Jz3k0t; Fri, 30 Sep 2022 22:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664576999; 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=OiZRFULfnsDza7PMMpvAIGex4FMLuA8hSG73olo2u2M=; b=oLu6a0pgHQtcHNktw2PWgLNIJZP1LRZMbeSYUvIKp2k3Cu0CiFmqbvNiX60fG5wXN9B4yg kC5JGaq/P3b761n2v9qt0y1oqcIcO/wCoCyO/joov/BEw2ZcglMResg4skCZJZZCY/8+2V vPavR93BkJ4AYN1MIrm2CEHzVmxzf4/LjADHOeZqMPgkxpW7ahSfCpsotrh+ygKhxbFrsD rexWoRvrnXWgCaBJRvzr7R4nXsSnDxXtR9WCUYsqmjsZMYMt5dsi8MguFVHBEJb7JbEh/2 YrwMNR0tDxGvpHt2RELYIGMoaptHHGy+5KP+CoFrRHqakvyajS7/kjUEOzbPBw== 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 4MfQ071dkDzKHm; Fri, 30 Sep 2022 22:29:59 +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 28UMTxQm019765; Fri, 30 Sep 2022 22:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28UMTxmn019764; Fri, 30 Sep 2022 22:29:59 GMT (envelope-from git) Date: Fri, 30 Sep 2022 22:29:59 GMT Message-Id: <202209302229.28UMTxmn019764@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: 764565249f6d - main - databases/iowow: 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: 764565249f6d4df63e65373b696037b9a43ef14e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664576999; 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=OiZRFULfnsDza7PMMpvAIGex4FMLuA8hSG73olo2u2M=; b=uC+pxOnoUSzWyzyVOhz8lqBrO7kcunnhRb5WdP4xVnIOmDCZFp61ChaKkp5SqHBtR16VFI XXe3TkHg03pmFcpgbBeHJe04uXRm1sGCTgipdEaFU/wVDFvwYZcFY5sBPWziDHAHuTJ84r DECrky7U+BTFa+dmlcCDzGmuv1VvlDsBNKT+LAud8wnoCMbWaBmFGecpZN+m7rogq5DGyz atXXxT3tp/6+xGrkwW0LbkzXCsQ5UtUWYZV2XreSEEbd39aNUIlP6QuuBnBU9xgcDQdf2u F67iOOjVaz99V/x2eQx4doiBvlCpP2ggsxa6SXDtD14OYakkzHXLEub/u6QtCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664576999; a=rsa-sha256; cv=none; b=AowLmmlUuzAL7Ex+aqOZdWDtfWEJXlf1J0FxFKJEsKEwujPC+B41ExLE+9I/v+e1IUuOcN aTyaILsks9vVef+onJBoiMfgBM3dOKvNnEZR9dWA9n52pe2cCywxRXMzs2MUAq133jot2E xDnJSff0+0xlXpuI9kVz+4Bek0bbAN4pe9DzlG3yUC7OGjmUTwngcmH8n75ZzG9gIv2x42 m5hsmhVDxZ38gF1xc3WKksIeVtBADuOhkmbGPZcUPYzdz762CVUknN77XqEOrLVgsryBL2 X469jmT2qwjO4xkSBj4k7kL+YyoGhCeKxMX8YqPHl+bZGPeCK5lKyXBwlj2Exw== 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=764565249f6d4df63e65373b696037b9a43ef14e commit 764565249f6d4df63e65373b696037b9a43ef14e Author: Xin LI AuthorDate: 2022-09-30 20:40:29 +0000 Commit: Xin LI CommitDate: 2022-09-30 22:28:04 +0000 databases/iowow: unbreak on -CURRENT after GNU qsort_r PR: ports/266227 Exp-run by: antoine Approved by: portmgr --- databases/iowow/files/patch-src_utils_sort__r.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/databases/iowow/files/patch-src_utils_sort__r.h b/databases/iowow/files/patch-src_utils_sort__r.h new file mode 100644 index 000000000000..3577a97bf4cc --- /dev/null +++ b/databases/iowow/files/patch-src_utils_sort__r.h @@ -0,0 +1,25 @@ +--- src/utils/sort_r.h.orig 2022-02-14 12:24:37 UTC ++++ src/utils/sort_r.h +@@ -25,10 +25,11 @@ + #define _SORT_R_INLINE inline + + #if ( defined __APPLE__ || defined __MACH__ || defined __DARWIN__ \ +- || defined __FreeBSD__ || defined __DragonFly__) && defined IW_HAVE_QSORT_R ++ || (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__) && defined IW_HAVE_QSORT_R + # define _SORT_R_BSD + #elif ( defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ \ +- || defined __linux__ || defined __MINGW32__ || defined __GLIBC__) && defined IW_HAVE_QSORT_R ++ || defined __linux__ || defined __MINGW32__ || defined __GLIBC__ \ ++ || (defined (__FreeBSD__) && defined(qsort_r))) && defined IW_HAVE_QSORT_R + # define _SORT_R_LINUX + #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__) + # define _SORT_R_WINDOWS +@@ -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)));