From nobody Fri Aug 30 19:37:48 2024 X-Original-To: dev-commits-ports-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 4WwT2P0C5zz5PZjN; Fri, 30 Aug 2024 19:37:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WwT2N62rsz4Xl4; Fri, 30 Aug 2024 19:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725046668; 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=KLYN9l/fvBGmbU/ax8wuF/xoIfQ+qf5S7pMdFhZtZfc=; b=OtRkGk/Y48lZxoq1K8kBS3uEu48QIwEvc29B4gvzbcljyV7x75YhLcQtsadhM4fOAyv4AJ vkdnOo3eer2rg74xTpZgwFRtakPDKWcT7++nnXmw/hqAQhtoi/42YopOkKfMjEp1u+2r6N ytPYvvMTK54C9YpHCWcBn8qWZJ7d1wNLz979CPsWhZGCa9HeC/TLMYhKJOW4IjVWl/PI04 V5hK72WxDQfnEXZxo706zn9Z7rn8vN4aVJtEhnYjPyHArWQ705mWSxEsELEMzqgj5iTbrt xBsHTD6cUHV1P+2wjfMkBcYF87nAzKaxLH+mYKDeIi+KNbBs/SnqWPUt8G4ixw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725046668; a=rsa-sha256; cv=none; b=vdpyAQzJfwGY1j95xOSW5nNZfczJjAWOVHQcUwaQon+GBjZB+MGak0UDLEpOs/RO7Sa2s1 pmCLRxANT54GKzwWv1+lDiAmSUBBQ7W2oGARqUrgZ+Tai32zc1oZUZ56KqvCEaPkgEAoYP cdUrEkZQm0ALn6d3Y0RTqJY7ayYFRpXdLtgd+BTiu8w7nCNf9mRNBvxvwfWCC4tRVCZBsq 85BbueCSZ0N7Eu9whzwa+YRBY5AsMW/7dNimGVM28Qtuu0oh4g4asyrrypXF5okzuZFC8N Vufg0XsBy0wX+zbEtTebYA3tvdlMFT3YNR2PHgocVDzkjEPLrdoB6OZCft7DXQ== 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=1725046668; 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=KLYN9l/fvBGmbU/ax8wuF/xoIfQ+qf5S7pMdFhZtZfc=; b=I6r9Opv7oGwOWxxHYW8lljc7+/Gyp6RHJrEQN3Rwn8wJCy9Sfq/I7DdAzuNWpbsnb2Q7Rk Igc88Mj3JRdsV8xzHnjns0qqalfDCovmpPSsMnjaN7CUASMEkR3q8hsm/LT31bR2Z5FWzP l6yUOwhgeyAnBKcdDOnwnRGgvIdAmvPp/Ry21fZ2D20M4yTM4nOgifjoBLI7ljWQpNl9ma 7bZwZ0HvKxzajYCE2kIR+/VAq08mrPxfeIRkhPa5UJyX1TmKWVoaEasvk/xU/VuPyMpQy8 ZuIg3K6lHGwAnc1if9j5zeaULZeyxc/YcMGvEMKCMIUWqnAv3vc3kE6v38RyIQ== 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 4WwT2N5X8yz1Cfm; Fri, 30 Aug 2024 19:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47UJbmBT081229; Fri, 30 Aug 2024 19:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47UJbmIG081226; Fri, 30 Aug 2024 19:37:48 GMT (envelope-from git) Date: Fri, 30 Aug 2024 19:37:48 GMT Message-Id: <202408301937.47UJbmIG081226@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 117ed7e19830 - 2024Q3 - editors/le: fix build with recent libc++ headers List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 117ed7e19830f213744750d5db48d45766f5c1a5 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=117ed7e19830f213744750d5db48d45766f5c1a5 commit 117ed7e19830f213744750d5db48d45766f5c1a5 Author: Dimitry Andric AuthorDate: 2024-08-30 19:07:16 +0000 Commit: Dimitry Andric CommitDate: 2024-08-30 19:35:01 +0000 editors/le: fix build with recent libc++ headers As reported on the ports mailing lists, with recent libc++ headers on e.g. 15.0-CURRENT, 13.4 or 14.2, editors/le fails with errors similar to: /usr/include/c++/v1/ios:257:25: error: expected ')' 257 | static const fmtflags hex = 0x0008; | ^ ./edit.h:158:26: note: expanded from macro 'hex' 158 | #define hex (editmode==HEXM) | ^ /usr/include/c++/v1/ios:257:25: note: to match this '(' ./edit.h:158:17: note: expanded from macro 'hex' 158 | #define hex (editmode==HEXM) | ^ This is because edit.h defines a `hex` macro, and this clashes with std::hex from the libc++ headers. To fix the build, use post-patch to rename the `hex` macro to `is_hex`. PR: 281141 Reported by: J David Approved by: zi (maintainer) MFH: 2024Q3 (cherry picked from commit 1aa709605c874eb09ce84076367d86a02023ee2d) --- editors/le/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/editors/le/Makefile b/editors/le/Makefile index d3c803e84423..04108f14cffb 100644 --- a/editors/le/Makefile +++ b/editors/le/Makefile @@ -20,6 +20,11 @@ GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share MAKE_JOBS_UNSAFE= yes +post-patch: + @${FIND} ${WRKSRC} -type f \( -name '*.[ch]' -o -name '*.cc' \) | \ + ${XARGS} ${GREP} -l '[[:<:]]hex[[:>:]]' | \ + ${XARGS} ${REINPLACE_CMD} -e 's/[[:<:]]hex[[:>:]]/is_hex/g' + derp-do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} le ${STAGEDIR}${PREFIX}/bin)