Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/gngeo/files/, games-emulation/gngeo/
Date: Thu, 31 Mar 2016 08:22:51
Message-Id: 1459412519.7f66870d913ad192d3ec1a8b5fc6d09e79e60d7a.mr_bones_@gentoo
1 commit: 7f66870d913ad192d3ec1a8b5fc6d09e79e60d7a
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 31 08:21:43 2016 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 31 08:21:59 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f66870d
7
8 games-emulation/gngeo: build with gcc5 (bug #571056); respect CFLAGS
9
10 Package-Manager: portage-2.2.26
11
12 games-emulation/gngeo/files/gngeo-0.8-cflags.patch | 41 ++++++++++++++++++++++
13 games-emulation/gngeo/gngeo-0.8.ebuild | 8 +++--
14 2 files changed, 46 insertions(+), 3 deletions(-)
15
16 diff --git a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
17 new file mode 100644
18 index 0000000..1a4892a
19 --- /dev/null
20 +++ b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
21 @@ -0,0 +1,41 @@
22 +--- configure.in.orig 2016-03-31 04:15:45.913917791 -0400
23 ++++ configure.in 2016-03-31 04:16:23.447607551 -0400
24 +@@ -236,20 +236,12 @@
25 + AC_DEFINE(PROCESSOR_INTEL, 1, [Define if you have an x86 processor])
26 + ALIGNLONGS=0
27 + proc_i386=true
28 +- CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \
29 +- -ffast-math -falign-functions=2 -falign-jumps=2 -fexpensive-optimizations \
30 +- -falign-loops=2 -fschedule-insns2 -malign-double -fomit-frame-pointer -g \
31 +- -fno-strict-aliasing -pipe -mtune=$target_cpu -DCPU=$target_cpu"
32 + ;;
33 + x86_64)
34 + AC_MSG_RESULT(Turning on x86_64 processor optimisations)
35 + AC_DEFINE(PROCESSOR_ADM64, 1, [Define if you have an x86_64 processor])
36 + ALIGNLONGS=0
37 + proc_x64=true
38 +- CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \
39 +- -ffast-math -fexpensive-optimizations \
40 +- -malign-double -fomit-frame-pointer -g \
41 +- -fno-strict-aliasing -pipe -DCPU=$target_cpu"
42 + ;;
43 + sparc*) AC_MSG_RESULT(Turning on sparc processor optimisations)
44 + AC_DEFINE(PROCESSOR_SPARC, 1, [Define if you have a sparc processor])
45 +@@ -258,8 +250,6 @@
46 + if test $target_cpu = sparc64 && test $CC_MAJOR -ge 3 ; then
47 + CFLAGS="$CFLAGS -mcpu=v9"
48 + fi
49 +- CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \
50 +- -ffast-math -fomit-frame-pointer -g"
51 + ;;
52 + arm) AC_MSG_RESULT(Turning on arm processor optimisations)
53 + AC_DEFINE(PROCESSOR_ARM, 1, [Define if you have an ARM processor])
54 +@@ -273,8 +263,6 @@
55 + *) AC_MSG_RESULT(Processor type unknown - Use generic optimisations)
56 + ALIGNLONGS=1
57 + optimum=no
58 +- CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \
59 +- -ffast-math -g"
60 + ;;
61 + esac
62 +
63
64 diff --git a/games-emulation/gngeo/gngeo-0.8.ebuild b/games-emulation/gngeo/gngeo-0.8.ebuild
65 index c6b76ce..d994c78 100644
66 --- a/games-emulation/gngeo/gngeo-0.8.ebuild
67 +++ b/games-emulation/gngeo/gngeo-0.8.ebuild
68 @@ -1,9 +1,9 @@
69 -# Copyright 1999-2015 Gentoo Foundation
70 +# Copyright 1999-2016 Gentoo Foundation
71 # Distributed under the terms of the GNU General Public License v2
72 # $Id$
73
74 EAPI=5
75 -inherit eutils autotools games
76 +inherit eutils autotools flag-o-matic games
77
78 DESCRIPTION="A NeoGeo emulator"
79 HOMEPAGE="https://code.google.com/p/gngeo/"
80 @@ -23,9 +23,11 @@ src_prepare() {
81 epatch \
82 "${FILESDIR}"/${P}-execstacks.patch \
83 "${FILESDIR}"/${P}-zlib.patch \
84 - "${FILESDIR}"/${P}-concurrentMake.patch
85 + "${FILESDIR}"/${P}-concurrentMake.patch \
86 + "${FILESDIR}"/${P}-cflags.patch
87 mv configure.in configure.ac || die
88 eautoreconf
89 + append-cflags -std=gnu89 # build with gcc5 (bug #571056)
90 }
91
92 src_configure() {