Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 May 2024 20:11:16 GMT
From:      Jessica Clarke <jrtc27@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 9019baf667c7 - stable/14 - jevents: Fix bootstrapping on macOS with Clang 16 / Apple Clang 15
Message-ID:  <202405022011.442KBGIi070058@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=9019baf667c77a85ae3e23bac127a3e99411b401

commit 9019baf667c77a85ae3e23bac127a3e99411b401
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-03-16 01:50:20 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-05-02 20:10:13 +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 <fts.h>
 
 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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405022011.442KBGIi070058>