From nobody Tue Jul 11 18:17:41 2023 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 4R0pxx4T22z2tqfx; Tue, 11 Jul 2023 18:17:41 +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 4R0pxx2rr6z4GZ0; Tue, 11 Jul 2023 18:17:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689099461; 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=LO9DsuSTiRWwvtPqZVoZVLjC4r0ZlIABDHqdfZbdrYg=; b=yEYPK6wU/c8Ftyx4VRZXDgNf5CqpB3k9M/3gF5IHYff8/pqdOHfDb6byvE/MILghCQzCUo lZcDBACixN0HczLTv9c8kEp5b+U78D2CLrEkvGdEzhOpfd85WVx9d6s++lAmdBToJ8HPF4 FeIO0u6UZg167wPxFCjvl8+CqeCHnWvtWwN03bUwFzGKmS5u8dqiKwQkHujv2dTD0rPgoK H1KdIQcOHBJG5tvuu90YadcQadooj/flMUylVrasTYZ0BUW20SCo4brjCNEUFiR1A+uBQP qsHr/Iuh+ORJa9stQbGCAjJT9Y7+E5tVfEvQ81NmratFt8ljD8XaU+ZoP832wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689099461; 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=LO9DsuSTiRWwvtPqZVoZVLjC4r0ZlIABDHqdfZbdrYg=; b=WRz/hA5eZSrnAVRJw95jb1wWT/4/qRFal3kk+W1KnwAMNZRxR6VH2Mj5CK8eP7JQi1iAsC 08EWon8unWZOx51xSgMpxcFoDo2FrBIkJPmChAtKhC0fs4o9dmuTWkZ9spmlTTUxal0aH1 qbLAOaXDgHnfYQuzRIxefDmFScQje0rN04E7PqRG9lR3dm1LdVmCHgnfxiXVf4cPObO31J SDTgOrIBPSo2MVlQaPD0iQi/xgCno4iBEp2kNX2TfqCrUa7KJX7ZxNbg2l3Q7SoUHejDq+ VFE8TqjY1AirSaBjOLwLZpVJ/goGMBG/LRaCM/1F2xarAoC+Cbt0aeHMbpGyig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689099461; a=rsa-sha256; cv=none; b=sVPvqgj1Rh7GNzkF0CF4+rDu+gffLsxBLhHLSrzmtoHxg/06NVG/sTB2pkpYMUqzM+B/p9 1eRU3YfbTAcZHlZCSQ5Cc1kw4rj+QrEJy6NILpooqTXZGUlhtPUrxnnEDfpCGiQxtIcbNO NqYWHU8LFlUz/5zTPlY2fAC6grIVnaQ65Jo2GR5DOXkJL+HZ5oZ77fswN1if2or7d2DcVZ 6+dHSGnki1h4zpfZ6jZAPKsO6rz2YTZjQFki+zUtkRtLtw/w3uXTJUO+vMgJFW4k1CCANB xzH+I9LF8FEUvLuHnAIg+rz5GgV9KQ9/VzNX0AXBBCNB3Cpt09gdEyP0lq0/wg== 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 4R0pxx1xtnzc80; Tue, 11 Jul 2023 18:17:41 +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 36BIHfWC022666; Tue, 11 Jul 2023 18:17:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BIHfQV022665; Tue, 11 Jul 2023 18:17:41 GMT (envelope-from git) Date: Tue, 11 Jul 2023 18:17:41 GMT Message-Id: <202307111817.36BIHfQV022665@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: 8e012871f3f0 - main - net-p2p/amule: Disable C++17 error about usage of the register keyword 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 8e012871f3f019d9dcd56ee288c84fb85bb0171d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rakuco: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e012871f3f019d9dcd56ee288c84fb85bb0171d commit 8e012871f3f019d9dcd56ee288c84fb85bb0171d Author: Raphael Kubo da Costa AuthorDate: 2023-07-11 18:14:00 +0000 Commit: Raphael Kubo da Costa CommitDate: 2023-07-11 18:14:00 +0000 net-p2p/amule: Disable C++17 error about usage of the register keyword Instead of forcing the port to build with -std=c++11 in all FreeBSD versions, just pass -Wno-register when the port is being built with a Clang release that defaults to C++17 mode (which does not have the register keyword by default). Approved by: eduardo (maintainer) Differential Revision: https://reviews.freebsd.org/D40939 --- net-p2p/amule/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index 775074c776ba..eaf9f659b12f 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -16,10 +16,6 @@ LIB_DEPENDS= libcryptopp.so:security/cryptopp USES= bison compiler:c++11-lang cpe desktop-file-utils gmake \ localbase:ldflags perl5 pkgconfig shebangfix tar:xz -# amule 2.3.3 does not work with C++17 which is the default since -# clang 16. This can be removed once that port starts working with C++17 and -# has its own USE_CXXSTD removed. -USE_CXXSTD= c++11 USE_PERL5= build USE_WX= 3.0 WX_CONF_ARGS= absolute @@ -122,4 +118,13 @@ post-patch-DOCS-off: post-install-FILEVIEW-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin -.include +.include + +# amule 2.3.3 does not work with C++17 which is the default since clang +# 16. Change the defaults and allow the `register' keyword to be used without +# triggering a compiler error to allow the build to work. +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +CXXFLAGS+= -Wno-register +.endif + +.include