From nobody Sat Jul 8 09:50:51 2023 X-Original-To: dev-commits-ports-main@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 4QylrX2WBKz4lfJd; Sat, 8 Jul 2023 09:50:52 +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 4QylrW6CQzz4Jxd; Sat, 8 Jul 2023 09:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688809851; 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=52v0d02upRQB+uaiXzUfWAYQgNDpk/iVjXkj2aidT1E=; b=JdbdhVNWekAN0gBRTO0U3zqfIAzOAXEq9vMU2BRnr7T74NiirtYem0Jud6viCVPwplcuHx 5qOH/tdcKwVCIK+cr572OyaigzvciUhrBASmc6wOy1C4UplyzFRfWtogL7OYwUev/oFcqV 37qOeDl4aWspA+UR6c8p8yyOQ0TnSd9F1cnGJc4nLZygEhKuX/vOKWecqkqNBn1mScakcB W/1fPHUwXoC5EjPUWI6ND9XgmHNAfuXAYS1KK/3ZCwk1Pct01Bcq3aNRXZbtHk+15aroyZ yBKLG5+GQGznLOLE8vW2ts74ZrF4GhdTBDgCAbaOfnbHAxo5OSV3kjTa5adcww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688809851; 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=52v0d02upRQB+uaiXzUfWAYQgNDpk/iVjXkj2aidT1E=; b=Y7uKuozJv4c2APfXJO4NZM4pgVVsdLq4tx88vphS4IwGsAoRFMwGheAvwmKfxb7IWElwvT m53GrsqO3z9GtAlXmUX78/CFUL4q7sjg984q4PtoRxEHZjkjpJqDi5GMD29iz3+cgT+2va n6dyiQPug2O1FNSYWSszrbAsK/OiNSI4bwd32CQ/42MQbOQA4fb1JrGWH3l8vofUvjR2zJ gSkB6cyojdna79rVnXLUpYCZMBjS/rYPv5+0I+Qd56PAyBQMBUe8OqzAbS4tcebndXR5Dv vSE1uIc9bm/+ZXFpE6xEJouGWA8N5mHNgKqTqC0gJyMjdFJsr7mb5CJBKjfubg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688809851; a=rsa-sha256; cv=none; b=Dzzes2Dloko5ifMK1IDeWk9OUj7nGcY9nCDSmWkfUhycWRyaR3m9W5EXy8fG///D4RfAco GsiN5onbDXDkuCtAr2YhvyxK6tonk8vHp2RHAB2PFwlWGqewYQghOQT8uBxEBgg9XodfmA kxyuL5mwMtb5xWka22gJT1+xL7YBOZw1F7YGyUYSfHr3+xPOBBhTp+c4Uc8x9q9by52tBd QjRAhMTsWPwpo8GZBm1OHICyg35rfgTJarj2szwNcAtcf242Jfskpon6nHMN1HfTL6yve3 7Fre8dUf8xnKMY2rQvnKnYDT+9QEzyJAZgDYnQvqX38F4slm0vwobw/vMY4Ufw== 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 4QylrW5JF8zH3W; Sat, 8 Jul 2023 09:50:51 +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 3689opjr096576; Sat, 8 Jul 2023 09:50:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3689opPW096575; Sat, 8 Jul 2023 09:50:51 GMT (envelope-from git) Date: Sat, 8 Jul 2023 09:50:51 GMT Message-Id: <202307080950.3689opPW096575@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Raphael Kubo da Costa Subject: git: ae8e32b08e33 - main - devel/qjson: Improve clang 16 workaround for usage of the 'register' keyword List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rakuco X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae8e32b08e33bac7aec0f14f28e45d53dee6f565 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rakuco: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae8e32b08e33bac7aec0f14f28e45d53dee6f565 commit ae8e32b08e33bac7aec0f14f28e45d53dee6f565 Author: Raphael Kubo da Costa AuthorDate: 2023-07-08 09:48:19 +0000 Commit: Raphael Kubo da Costa CommitDate: 2023-07-08 09:50:36 +0000 devel/qjson: Improve clang 16 workaround for usage of the 'register' keyword Commit 3237ce1557467a3f89a3d1fa7a9308161665bf0c fixed the build on CURRENT with a heavy hammer that made register a macro. This change passes -Wno-register to the compiler instead, which is cleaner. Approved by: arrowd Differential Revision: https://reviews.freebsd.org/D40938 --- devel/qjson/Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile index 60f4d1401fb5..b2c2aa354718 100644 --- a/devel/qjson/Makefile +++ b/devel/qjson/Makefile @@ -29,12 +29,6 @@ OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 -CXXFLAGS+= -Dregister= -.endif - post-build-DOXYGEN-on: cd ${WRKSRC}/doc && doxygen @@ -42,4 +36,12 @@ post-install-DOXYGEN-on: ${MKDIR} ${STAGEDIR}${_DOCSDIR} cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${_DOCSDIR} -.include +.include + +# Clang 16 defaults to building in C++17, and throws an error when the +# `register' keyword is used. Make clang just ignore the keyword instead. +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +CXXFLAGS+= -Wno-register +.endif + +.include