FreeBSD Bugzilla – Attachment 249527 Details for
Bug 278002
games/endless-sky: fix build with clang 18
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
games/endless-sky: fix build with clang 18
games__endless-sky-fix-clang18-build-1.diff (text/plain), 1.58 KB, created by
Dimitry Andric
on 2024-03-27 20:54:28 UTC
(
hide
)
Description:
games/endless-sky: fix build with clang 18
Filename:
MIME Type:
Creator:
Dimitry Andric
Created:
2024-03-27 20:54:28 UTC
Size:
1.58 KB
patch
obsolete
>commit 9b5c86d72ba188b8397112c4d51e04ef585c7cf5 >Author: Dimitry Andric <dim@FreeBSD.org> >Date: 2024-03-27T21:51:06+01:00 > > games/endless-sky: fix build with clang 18 > > With clang 18, games/endless-sky fails to build: > > /wrkdirs/usr/ports/games/endless-sky/work/endless-sky-0.10.4/source/Audio.cpp:252:3: error: reference to 'queue' is ambiguous > 252 | queue[it.first].Add(it.second); > | ^ > /usr/include/c++/v1/queue:301:28: note: candidate found by name lookup is 'std::queue' > 301 | class _LIBCPP_TEMPLATE_VIS queue { > | ^ > /wrkdirs/usr/ports/games/endless-sky/work/endless-sky-0.10.4/source/Audio.cpp:85:33: note: candidate found by name lookup is '(anonymous namespace)::queue' > 85 | map<const Sound *, QueueEntry> queue; > | ^ > > This is because Audio.cpp contains "using namespace std;" and then the > name 'queue' is already in use by the standard library. Fix it by > renaming the local variable 'queue' to 'queue_'. > > PR: 278002 > MFH: 2024Q1 > >diff --git a/games/endless-sky/Makefile b/games/endless-sky/Makefile >index cb34395669b4..cf0be1539ea6 100644 >--- a/games/endless-sky/Makefile >+++ b/games/endless-sky/Makefile >@@ -31,6 +31,9 @@ PORTDOCS= * > > OPTIONS_DEFINE= DOCS > >+post-patch: >+ ${REINPLACE_CMD} -e 's|\<queue\>|queue_|g' ${WRKSRC}/source/Audio.cpp >+ > post-build: > @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|; s|share/games|share|' \ > ${WRKSRC}/source/Files.cpp
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 278002
: 249527