From nobody Fri Sep 30 22:29:56 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 4MfQ051KlJz4d2mv; Fri, 30 Sep 2022 22:29:57 +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 4MfQ050lh4z3jjW; Fri, 30 Sep 2022 22:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664576997; 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=BBPYVwYV3F4RPV/vNlPUkbyWW0C3C5Uk7EL6ZfGNHR4=; b=PlQaNIJ1b6G9OIze/uenyZNM+qwZde1DqYB0fkI3aqaH8RPHsfT+OSiHxByO/9KKh3cwUQ yCHYuAAG4af1l1Ti0WxvlAfisNVQPymnIdmCa+Exn29a8Vzj0y/OmcKcWiFMagwe5x2uKj XFd3zHTxEIIYvdoWv/aGONghX5sydCgnSTb02UXPYMZokqQMQkQg6540/sooZBufOXyDha C3j99mf3q7aQHRH2rBD4XlJ+tpRAv1zy1lwa0fIeMsVQcMVxUQUOrfRA6PodaXGMcERcxY NsiwGGcP58zDBabX8d8FA8qWnEE54tlNtxSmHu0s1G39+K4DyUMpI6hq9oC1+w== 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 4MfQ046v7MzKWg; Fri, 30 Sep 2022 22:29:56 +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 28UMTuFj019714; Fri, 30 Sep 2022 22:29:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28UMTuL1019713; Fri, 30 Sep 2022 22:29:56 GMT (envelope-from git) Date: Fri, 30 Sep 2022 22:29:56 GMT Message-Id: <202209302229.28UMTuL1019713@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: 82665ce295c0 - main - sysutils/e2fsprogs: Fix qsort_r detection for POSIX qsort_r(3). 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: 82665ce295c0cdd2494bf09356d169ef28442a0a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664576997; 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=BBPYVwYV3F4RPV/vNlPUkbyWW0C3C5Uk7EL6ZfGNHR4=; b=RbvE/Ec1pOkRwMBKbumHHyqxKHoN6MRJ6/oAbw3EtwDjyi7/vpUcsSp+f00RKChfOVKvQO 2yLhZjA/T4Qmkhd+hnmIGrDp55dLhwqBtq6Oy2x1lhS4+3TmnheI4+Rg+xZEKCtDstnw/i RurMT2YihBXqjHvA1aam6VICW0pC1W/3oCvviKCzFJtLxA7jhZxYi4Gq0CCBncy/7Y7LTP nHkSdLv9v0EcQGlQEYeK0/vIq61gOdLmx+ZyD14jXqkgvgmNWlrNicGojhIjgb1bwcngsI aOBBKF8hZWre/iG6UsW2YmqwIfklI26pC3MaUddTiIZQ+ZNtMa900Cfp4GlHCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664576997; a=rsa-sha256; cv=none; b=OkAJyMp6b4KADarp4el89sgA44VSMuhIhOxm7WGeBBsAi9HvBa/CSTog9IkiD6Q4feOPDa pRbBHWJmOyCGwm2ALh8A6tlXKq4NQsKhRevAzOPQk50DnD0QUYBzfVFa5lTfWjBjA6qN88 rKjcW3K6fUZTbCT6FkuiIhJylkij9Hg6nG0G7nhCxGo+Rf5JVrFagFi6TyTTLyvqDllJrv hs3/ckYc8cFqDWLpZWSyozmsYc49QVA77KcPhiVMVzfRAW77cgUVZIjkge9shyi064E4r1 TR14JlJDQXLUV0z8PytrD80DsDVbMyEdbnlYR/YylJSqvo4Xt1xzavwEuzNj5w== 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=82665ce295c0cdd2494bf09356d169ef28442a0a commit 82665ce295c0cdd2494bf09356d169ef28442a0a Author: Xin LI AuthorDate: 2022-09-30 17:02:48 +0000 Commit: Xin LI CommitDate: 2022-09-30 22:28:03 +0000 sysutils/e2fsprogs: Fix qsort_r detection for POSIX qsort_r(3). PR: ports/266227 Exp-run by: antoine Approved by: portmgr --- sysutils/e2fsprogs/Makefile | 2 +- .../e2fsprogs/files/patch-lib_support_sort__r.h | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index f45b04a5762e..9a89d8de14f6 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -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} diff --git a/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h b/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h new file mode 100644 index 000000000000..dec89ce8ef9a --- /dev/null +++ b/sysutils/e2fsprogs/files/patch-lib_support_sort__r.h @@ -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))); +