From nobody Sun May 21 09:14:03 2023 X-Original-To: x11@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 4QPFJC13tvz4CHHX for ; Sun, 21 May 2023 09:14:03 +0000 (UTC) (envelope-from bugzilla-noreply@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 4QPFJB6Vxsz3y35 for ; Sun, 21 May 2023 09:14:02 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684660442; 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: in-reply-to:in-reply-to:references:references; bh=oXhAjlXdvc2f6+PyGOqj3AT+9UhLjPmZencPVFLNOQI=; b=lhbERPongULdc4LlO7gLW0x8UXOouDfhMtPStKa9yDBwTPpM+pPh2Gpwj324AV49OONugw Q6gOTd7r3F00/kbRpM4WFKYKDvHA8Z7HnRXkqqm042rGl7VOCH8LjQHdbw/gMiFGHDAk5g tW/Kmz7bbog5X2gSZkmp+cKmHp9R1w3yzl/nAiDigtWKAa3YEsf9ZmcPApeGJpl4WgzsuM 2C191khtzWnDXzrREdPt3/Wxox6qyKIjtfEYSKRHja//7aIPfntqqwyjVSh4bwFPW1gpc3 MHjRk/RD/NRtc6WJ4yad2j0jdDdPs+sgUa9QOpbkku6UVin2B2KgtYDPyb8Zcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684660442; a=rsa-sha256; cv=none; b=SSulNCL0xqynBCJJAkIXn2ChH0hQlMpx4V0Fz5RufZxIkhZd1/d6moQvqrz/FSc38WlVyl 1d0b1y8X+q5mHitIvTFfDI+K4gactGf9FHLSKhSPBGX51Cx7tc3GWEPfR/BSt0eBNSVgWQ Zs8fSz9fPgNtDFLJ8v7s/r2/nh2SgsQ4M91x2z5lh8O6Rg5zzy1WvWy2Vkj5XJFgF/w1JF 3suXEqQRHtF95gF1393Rp8Nb1h4pz+gY5wXga/vF4MneMj2G4nihb0nwWi4WBCpqqV57o2 1UvLuoKPfwRDA7LX3tNFWmzTLbuf6gAojmUXXcvgNdmDwuWYxuBJj1SeQvPXjQ== Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 4QPFJB5cNMzlmh for ; Sun, 21 May 2023 09:14:02 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 34L9E20G001645 for ; Sun, 21 May 2023 09:14:02 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 34L9E2vg001642 for x11@FreeBSD.org; Sun, 21 May 2023 09:14:02 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: x11@FreeBSD.org Subject: [Bug 271533] x11/xorgproto: ensure Xos.h does not define index() as a macro Date: Sun, 21 May 2023 09:14:03 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: dim@FreeBSD.org X-Bugzilla-Status: In Progress X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: x11@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback+ X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: X11 List-Archive: https://lists.freebsd.org/archives/freebsd-x11 List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D271533 --- Comment #3 from commit-hook@FreeBSD.org --- A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=3De5a0215417930a60ac8fbbc630fad6a= a354446e5 commit e5a0215417930a60ac8fbbc630fad6aa354446e5 Author: Dimitry Andric AuthorDate: 2023-05-20 15:15:41 +0000 Commit: Dimitry Andric CommitDate: 2023-05-21 09:12:30 +0000 x11/xorgproto: ensure Xos.h does not define index() as a macro During the exp-run for clang 16, it turned out that Xos.h defines index() and rindex() as preprocessor macros, and this causes many problems with libc++ headers [1]: /usr/include/c++/v1/variant:532:39: error: too few arguments provided= to function-like macro invocation return __at(__fmatrix, __vs.index()...)( ^ /usr/local/include/X11/Xos.h:67:12: note: macro 'index' defined here # define index(s,c) (strchr((s),(c))) ^ /usr/include/c++/v1/variant:813:18: error: too few arguments provided= to function-like macro invocation return index() =3D=3D variant_npos; ^ /usr/local/include/X11/Xos.h:67:12: note: macro 'index' defined here # define index(s,c) (strchr((s),(c))) ^ /usr/include/c++/v1/variant:817:25: error: expected ';' at end of declaration list constexpr size_t index() const noexcept { ^ /usr/include/c++/v1/variant:802:9: error: member initializer '__data' does not name a non-static data member or base class : __data(__tag), __index(__variant_npos<__index_t>) {} ^~~~~~~~~~~~~ /usr/include/c++/v1/variant:808:9: error: member initializer '__data' does not name a non-static data member or base class __data(in_place_index<_Ip>, _VSTD::forward<_Args>(__args)...), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/c++/v1/variant:920:23: error: too few arguments provided= to function-like macro invocation __rhs.index(), ^ /usr/local/include/X11/Xos.h:67:12: note: macro 'index' defined here # define index(s,c) (strchr((s),(c))) ^ Add defined(__FreeBSD__) to Xos.h's #if block to include instead, so it will get our regular index() and rindex() declarations instead. This has also been sent upstream [2]. [1] [2] PR: 271533 Approved by: manu (maintainer) MFH: 2023Q2 x11/xorgproto/Makefile | 1 + x11/xorgproto/files/patch-include_X11_Xos.h (new) | 11 +++++++++++ 2 files changed, 12 insertions(+) --- Comment #4 from Dimitry Andric --- Note that in the mean time, upstream has applied my merge request: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/6c3a7302fcc7ec= f05960ad1794c5effeda5d4945 --=20 You are receiving this mail because: You are the assignee for the bug.=