diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2023-07-11 18:14:00 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2023-07-11 18:14:00 +0000 |
| commit | 8e012871f3f019d9dcd56ee288c84fb85bb0171d (patch) | |
| tree | 333f4b05ed3f534283a2fa8f5d4ecd77e3763782 | |
| parent | fdab91faa578fbe5c0328ea9227911d7630267b4 (diff) | |
| download | ports-8e012871f3f019d9dcd56ee288c84fb85bb0171d.tar.gz ports-8e012871f3f019d9dcd56ee288c84fb85bb0171d.zip | |
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
| -rw-r--r-- | net-p2p/amule/Makefile | 15 |
1 files 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 <bsd.port.mk> +.include <bsd.port.pre.mk> + +# 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 <bsd.port.post.mk> |