From nobody Thu May 2 20:12:10 2024 X-Original-To: dev-commits-src-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 4VVlTQ1yKHz5JyL1; Thu, 2 May 2024 20:12:10 +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 4VVlTQ1Vdnz4tJ6; Thu, 2 May 2024 20:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714680730; 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=g7UwjwY+/3SDLNzfwnwtex9AFT8lz/kRACoA6VbR++8=; b=o6A+0qg12TwZngT5M0dzOh8XwZLGl9g4v4A44+chpNwG6B6VdMfud6p56BA7ab1yOe5Dc4 MpuJxGjgaxBL+CWqSg8dw0RrZ7UOPP+iKdAlrTBvrs3qZF85u1nISjspP1IL3nv1zNvHZd kwS0rlyd6bxTVJxBsImpgqJfI3AfTr8kobyqYhnTNXvw8uQKMfi5rv6hPEbU9hQEdB+8LF bU1YgckIeiPEvGByfTvmz3mSfqCFOzi/hPXTwrmYOG+xyJCHAiZ8zSENbQrKQsCQSfBToz LIYtQXTOBeQjCUOaXgqYSdufLbkgFPzBcQ8nkUrOqsR/N3yG/W/tVsVjA193yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714680730; a=rsa-sha256; cv=none; b=x7mbb+qia/PUB8K2hanG93fsbOE+zsUmBmCB7DmUD46cM17XllrpXX0li536CQyCinUEJv ZKx27vDhxjZ6/m27I7q8fPQOOpcaqwf+/RHm5b4UYo/MBagT310t+MzEViltRQBHsOXj/m gxyj+s+SZnRlSC6FrAa0t7GCqfMVT8QditCMb9enqH/7cukpLKzLTytXwc/RXH7v7pZ5vF /aoiAeRSCwrhrg7ZTuTCh3Q3KlVKDPeef6oEGXz17oEjp7S+Kt09HKokJ2cHMp1G4CCgPk rZ8c0QZGtxfDA6+Oq0OL9u4n9bBOAwOgIF95RJ0c/f1H1HNjkl5JmqW0AE7n7w== 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=1714680730; 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=g7UwjwY+/3SDLNzfwnwtex9AFT8lz/kRACoA6VbR++8=; b=QkVlyegRvc1P+WbeYDspoiW9IrAQ3XO7pRt0gxXyCi8QZvGm76pEc36tt5elhosNgcESbz XH2+PO6VjV9b4yPLu4APCc5MlI7tGmoG+RufA1ekh82+xkQav4uGtCPRSvXOJMTFVw9kWc CV0GdfzTAojQg7MuIKRLCeyh5g39fl7OlH3Pgs4aj0C+yNXqCu9e2zPt/wefIz3wA5KLDI rbcn1+FUVV0w9InXoqYjtuBWlfoy0lOam2YVgwaSTi3BIHFd3vh+80Zormyv1iyybyrOKG NtaEgavKR/bdyopLjsOAUJ7nOe7FBeUrZ14gOLBmmGHjB2yHvkWCSefjExlbVw== 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 4VVlTQ16FBzHCc; Thu, 2 May 2024 20:12:10 +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 442KCAdw072339; Thu, 2 May 2024 20:12:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442KCA0n072336; Thu, 2 May 2024 20:12:10 GMT (envelope-from git) Date: Thu, 2 May 2024 20:12:10 GMT Message-Id: <202405022012.442KCA0n072336@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: dbbbe6f393dd - stable/13 - mandoc: fix bootstrapping on Linux with Clang 16 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: dbbbe6f393ddc1a6366bc3a24bc9c358b9eb9732 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=dbbbe6f393ddc1a6366bc3a24bc9c358b9eb9732 commit dbbbe6f393ddc1a6366bc3a24bc9c358b9eb9732 Author: Alex Richardson AuthorDate: 2023-12-12 05:08:38 +0000 Commit: Jessica Clarke CommitDate: 2024-05-02 20:11:52 +0000 mandoc: fix bootstrapping on Linux with Clang 16 It appears that Clang 16 errors by default for the mismatched function pointer types that are triggered by the fts callback (since glibc has a callback type without the second const qualifier). Fortunately, there is already code to handle glibc inside mandoc, we just have to edit the checked-in config.h. Reviewed By: imp, emaste Differential Revision: https://reviews.freebsd.org/D42999 (cherry picked from commit 0156465c6d11e1ef064d104443047e4146e5b925) --- contrib/mandoc/config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/mandoc/config.h b/contrib/mandoc/config.h index 553c4c8b7400..213513f1c87e 100644 --- a/contrib/mandoc/config.h +++ b/contrib/mandoc/config.h @@ -13,7 +13,11 @@ #define HAVE_ENDIAN 0 #define HAVE_ERR 1 #define HAVE_FTS 1 +#ifdef __GLIBC__ +#define HAVE_FTS_COMPARE_CONST 0 +#else #define HAVE_FTS_COMPARE_CONST 1 +#endif #define HAVE_GETLINE 1 #define HAVE_GETSUBOPT 1 #define HAVE_ISBLANK 1