From nobody Thu May 02 20:12:13 2024 X-Original-To: dev-commits-src-branches@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 4VVlTT6HTHz5JyNm; Thu, 2 May 2024 20:12:13 +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 4VVlTT4z8nz4tMR; Thu, 2 May 2024 20:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714680733; 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=IIy61CACIbM7jhfLa1JxDShzTqEe24a6ATg8IG1/Ck8=; b=JEAsvL0rpABsaY0r/FH49CU2nzd4oHYy9lJchK5bAechSijeCTIB9DqjmAmaMzjRkvelEb eoihOn7RcoyzTrutnOmFj8iNBnVpmaz33tDINbgCvoQvFc4urMJrvK3RteeLw5MGIiTx6W aPASfliEvPnJPVKxBuUAkZDdvrPuhg4ZIsFwaxZtrg4rL9Yx5WWxByz9DWLhOzI1mQ7Hkw vinUikTI4rObpoa8oYtQJ92sOjx2C7nwg31rboBbUH2YBj5NNvIX0Lp/qZr3bnZMnY5jde IAZPoSTRWX47qkYNNy83quUQN3e8C68pDKrVOy9UeVatnSL1jgDj59dHnp5K/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714680733; a=rsa-sha256; cv=none; b=ZSSd+JTEtpJQiDEhesDtsQ2eCY5RwnP7shica6NjQ1uVTw+I6aVNyu+AZ4VF7U1/cfRMr9 hEQZUQ7ZcQhs6HfN19cMj0glKOx7JfbCR7akR6dh8jR2sNEJ1MAbJvQiQPx7gQ5LPfZ5Jw CCU6pt0mgY9q0rvx1KysHrI90KF7/3aYBNi8Zfzz5vC87CRvevju3WjSZ64+9CTEtLn0N/ ykwdpHA3aBfd+8gQID/FY6dfc3GAvuWJp/TvfcKyfaT/jOw8NhOmi315ewfsCwrpVuKpj7 lw8prYzeCXT5o5fCA8a+ElDIWFcExBMkPatl7ztwLbmEwMWL4Bx/74FuDfjnBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714680733; 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=IIy61CACIbM7jhfLa1JxDShzTqEe24a6ATg8IG1/Ck8=; b=RK3Q0mgSzKsKRNyFUDJnBSOtrRSfApNpbc22xBJv1GPTUxv1v5JISs3UzL5F/dxWRB2d42 MSUXOHQ7FdvboVry6A1Q9EEYZY/lDAR1MHjpcQBc7qrpKuuef8MaKFD3lp3AVcaZ4U6OZu Hp8dCla9MWojnvXVDYjUhsUna0MjYHOPH4EU1Sm/CqabbGv5bvEJ96YgtBNMgrbd19W5+b GNkkbzN+kieXwT1n86+bB2mmfOu9lbqtqtK9wRItXesfy5/jqwi+8D4gg9oWUIsPWdeXKx mAAlRZm5zjg9TUst5iKaISzhFF2MJyEv7qD/ASgBDXtM9Ad3K04pUspn5NzeUA== 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 4VVlTT428SzHF2; Thu, 2 May 2024 20:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 442KCD57072516; Thu, 2 May 2024 20:12:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442KCDYI072513; Thu, 2 May 2024 20:12:13 GMT (envelope-from git) Date: Thu, 2 May 2024 20:12:13 GMT Message-Id: <202405022012.442KCDYI072513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 89342dba7dbe - stable/13 - jevents: Fix bootstrapping on macOS with Clang 16 / Apple Clang 15 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 89342dba7dbead47677ea82522174010697b17bc Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=89342dba7dbead47677ea82522174010697b17bc commit 89342dba7dbead47677ea82522174010697b17bc Author: Jessica Clarke AuthorDate: 2024-03-16 01:50:20 +0000 Commit: Jessica Clarke CommitDate: 2024-05-02 20:11:52 +0000 jevents: Fix bootstrapping on macOS with Clang 16 / Apple Clang 15 macOS, like Linux, does not include an outer const qualifier for its fts_open callback arguments, so -Wincompatible-function-pointer-types also picks this up and breaks the build now Clang 16 makes it an error by default. Extend the existing Linux support to fix this. MFC after: 1 week (cherry picked from commit d8c84215d7675b7940412122b6d7026bd193c9b5) --- lib/libpmc/pmu-events/jevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpmc/pmu-events/jevents.c b/lib/libpmc/pmu-events/jevents.c index 590b465af400..7059b31da2ba 100644 --- a/lib/libpmc/pmu-events/jevents.c +++ b/lib/libpmc/pmu-events/jevents.c @@ -1355,7 +1355,7 @@ err_out: #include static int -#ifdef __GLIBC__ +#if defined(__GLIBC__) || defined(__APPLE__) fts_compare(const FTSENT **a, const FTSENT **b) #else fts_compare(const FTSENT * const *a, const FTSENT * const *b)