From nobody Fri Aug 30 19:33:51 2024 X-Original-To: dev-commits-ports-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 4WwSxq2Fdvz5PZjF; Fri, 30 Aug 2024 19:33:51 +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 4WwSxq1H3xz4Y69; Fri, 30 Aug 2024 19:33:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725046431; 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=GR5kYQ1V40BUhahTAyOsyb5BJLLiGb4xd9lDDISpByo=; b=sx1f8ixKe6d9pvR5Ce32u1OWPhHDrcKzEc44u+JDImiRPo5tR10OKTk3pnZTrxscYcSRpU 1AQHxV3FN6uy3ipqgOmZ99hLadH+4SfeHBu0zt7mGkEfdOwCcA7qcTrsSW/T4qfSWnU0d4 zUGZ7SGl4aWV9J4SVguLBKnkOxeXTHqjPs6rqRahcBHH8wxIBjFJ4dZfW/Mqpgd3Ed7zeV abLM0iQQGtompFG2ynCTly6C0E6ErsBhqVZZOuVpuMW6XmfUqhho8s8DIhsnsmhC/Xz6a2 bqGPfu6Jg6wJcjlmwcIc72wVpPFtJ6dJnv2Cqf0/c9V8UK70FtLSNJYhkLqssQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725046431; a=rsa-sha256; cv=none; b=E6wZPuEqajB7FzjdHQrmjDzDSlfgmUw850aPSYZZju0ljUy01THH2LrM7BruJ1InUDvS5I N9Qo8mXMQgY4u+oF99u56GjWx24KNacP8vDTTaY2Vofm/U8FWZh5xpXZcuiEyfBe1IgraF /H80Y6yqFEIFycKI/He76wnaCkHoagveZhW8puCw1FyP7T1+voW7bmPygo7Y/j039+jq+9 qbQCIa3dEGRm/PejGwFnKhBD0yqj+S8J0YScUq7Fj+VgcBd4AvqHowwsNmN6IlPsR7JQ2m tjpPIqDDtNmkxoaniTsK4F/CjqwR/3/wCuhZD1c1W5jsTvj9fXGKF4Vq2XcgHQ== 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=1725046431; 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=GR5kYQ1V40BUhahTAyOsyb5BJLLiGb4xd9lDDISpByo=; b=fTemuJyP4aM2Zgd0C60iuNAQ/hObDaWYO4YczA1XQHlzDTMNFgio52dQAf50zVzgkrU6CS 9JW+mYKvac/vIvW0d5YZS00cdnn0bSVnh4pvpugnebFig9XPLmTbqo1WWCzNsS4WX+z2hu i9Bzosdmr5dFzBTFq3t6ZZk3dtrnyHYojRGte1cHfNJbufM8A3X0ZHIwHfiugwemd1R6io ewMMjZ8n7g9FWq0b9kZeqZbfrEv1+g7i4N9OtIR3WXvwQamjhKYH3b2rAjCOR3aZ/LwmPQ Ayp/x86WgMjqVZzNFPIpqS4eJ2CyL+e/xwOImsnoSST54ktp418hC+/UDsf/gA== 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 4WwSxq0tpfz1CQT; Fri, 30 Aug 2024 19:33:51 +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 47UJXpBE080531; Fri, 30 Aug 2024 19:33:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47UJXpeo080528; Fri, 30 Aug 2024 19:33:51 GMT (envelope-from git) Date: Fri, 30 Aug 2024 19:33:51 GMT Message-Id: <202408301933.47UJXpeo080528@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 1aa709605c87 - main - editors/le: fix build with recent libc++ headers List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 1aa709605c874eb09ce84076367d86a02023ee2d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=1aa709605c874eb09ce84076367d86a02023ee2d commit 1aa709605c874eb09ce84076367d86a02023ee2d Author: Dimitry Andric AuthorDate: 2024-08-30 19:07:16 +0000 Commit: Dimitry Andric CommitDate: 2024-08-30 19:29:53 +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 --- 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)