Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F146883783
D40939.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D40939.diff
View Options
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -16,10 +16,6 @@
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-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>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Mar 7, 11:38 AM (3 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29338867
Default Alt Text
D40939.diff (1 KB)
Attached To
Mode
D40939: net-p2p/amule: Disable errors related to the 'register' keyword instead of changing C++ standard used to build port
Attached
Detach File
Event Timeline
Log In to Comment