commit: 26bb54471ac2c096fef160d3eb68fbb3fd0eb9b6 Author: Alexey Sokolov <sokolov <AT> google <DOT> com> AuthorDate: Mon Nov 16 21:45:51 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Nov 16 21:45:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26bb5447
games-fps/nexuiz: correctly pass flags and compiler Closes: https://bugs.gentoo.org/739288 Closes: https://bugs.gentoo.org/710826 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Signed-off-by: David Seifert <soap <AT> gentoo.org> games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild index 2778fcff0c0..e23daea87d6 100644 --- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild +++ b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils +inherit eutils toolchain-funcs MY_PN=Nexuiz MY_P=${PN}-${PV//./} @@ -69,9 +69,8 @@ src_prepare() { # Make the game automatically look in the correct data directory sed -i \ - -e "/^CC=/d" \ - -e "s:-O2:${CFLAGS}:" \ - -e "/-lm/s:$: ${LDFLAGS}:" \ + -e 's:-O2:$(CFLAGS):' \ + -e '/-lm/s:$: $(LDFLAGS):' \ -e '/^STRIP/s/strip/true/' \ makefile.inc || die @@ -88,6 +87,7 @@ src_prepare() { } src_compile() { + tc-export CC if use opengl || ! use dedicated ; then emake cl-${PN} if use sdl ; then
