Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/zsnes/
Date: Fri, 18 Jun 2021 21:07:44
Message-Id: 1624050413.65f231d3f8e95477c26ffeab12e5f748b35df26d.soap@gentoo
1 commit: 65f231d3f8e95477c26ffeab12e5f748b35df26d
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 18 21:06:53 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 18 21:06:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f231d3
7
8 games-emulation/zsnes: respect ${PKG_CONFIG}
9
10 Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 games-emulation/zsnes/zsnes-1.51-r9.ebuild | 13 ++++++++-----
15 1 file changed, 8 insertions(+), 5 deletions(-)
16
17 diff --git a/games-emulation/zsnes/zsnes-1.51-r9.ebuild b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
18 index a92368d1bf9..f97e76f1228 100644
19 --- a/games-emulation/zsnes/zsnes-1.51-r9.ebuild
20 +++ b/games-emulation/zsnes/zsnes-1.51-r9.ebuild
21 @@ -26,7 +26,7 @@ RDEPEND="
22 DEPEND="${RDEPEND}"
23 BDEPEND="
24 dev-lang/nasm
25 - debug? ( virtual/pkgconfig )
26 + virtual/pkgconfig
27 "
28
29 PATCHES=(
30 @@ -74,8 +74,8 @@ src_prepare() {
31 -e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \
32 -e '/^LDFLAGS=.*local/d' \
33 -e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \
34 - -e '/lncurses/s:-lncurses:`pkg-config ncurses --libs`:' \
35 - -e '/lcurses/s:-lcurses:`pkg-config ncurses --libs`:' \
36 + -e '/lncurses/s:-lncurses:`${PKG_CONFIG} ncurses --libs`:' \
37 + -e '/lcurses/s:-lcurses:`${PKG_CONFIG} ncurses --libs`:' \
38 configure.in || die
39 sed -i \
40 -e 's/configure.in/configure.ac/' \
41 @@ -85,13 +85,16 @@ src_prepare() {
42 }
43
44 src_configure() {
45 - tc-export CC
46 + tc-export CC PKG_CONFIG
47 +
48 export BUILD_CXX=$(tc-getBUILD_CXX)
49 export NFLAGS=-O1
50 +
51 use amd64 && multilib_toolchain_setup x86
52 use custom-cflags || strip-flags
53
54 - append-cppflags -U_FORTIFY_SOURCE #257963
55 + # bug #257963
56 + append-cppflags -U_FORTIFY_SOURCE
57
58 econf \
59 $(use_enable ao libao) \