Date: Wed, 23 Dec 2020 22:02:59 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559035 - head/games/stratagus Message-ID: <202012232202.0BNM2xWB028549@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Wed Dec 23 22:02:58 2020 New Revision: 559035 URL: https://svnweb.freebsd.org/changeset/ports/559035 Log: games/stratagus: fix build on GCC architectures -Wno-c++11-narrowing is only for clang. gcc needs -Wno-error: In file included from /wrkdirs/usr/ports/games/stratagus/work/stratagus-2.4.2/src/include/video.h:46, from /wrkdirs/usr/ports/games/stratagus/work/stratagus-2.4.2/src/action/action_attack.cpp:60: /usr/local/include/SDL/SDL_opengl.h:116: error: "GL_GLEXT_VERSION" redefined [-Werror] 116 | #define GL_GLEXT_VERSION 29 | Modified: head/games/stratagus/Makefile Modified: head/games/stratagus/Makefile ============================================================================== --- head/games/stratagus/Makefile Wed Dec 23 21:49:12 2020 (r559034) +++ head/games/stratagus/Makefile Wed Dec 23 22:02:58 2020 (r559035) @@ -27,8 +27,6 @@ CMAKE_ARGS= -DGAMEDIR:STRING="bin" \ -DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so" CMAKE_ON= ENABLE_DEV -CXXFLAGS+= -Wno-c++11-narrowing - PORTDOCS= * OPTIONS_DEFINE= MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH DOCS @@ -67,4 +65,12 @@ post-install-DOCS-on: @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "[a-z]*.html *.txt graphics scripts" \ ${STAGEDIR}${DOCSDIR} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${CHOSEN_COMPILER_TYPE} == clang +CXXFLAGS+= -Wno-c++11-narrowing +.else +CXXFLAGS+= -Wno-error +.endif + +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012232202.0BNM2xWB028549>