summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2009-06-18 01:48:48 +0000
committerTristan Heaven <nyhm@gentoo.org>2009-06-18 01:48:48 +0000
commit0be322f68e795165565070606a953f876394811c (patch)
tree248c2363da97c2f90dd313ba298c5dc2b4b72e3a /games-board/eboard
parentMarking mozilla-firefox-3.0.11 ppc64 and ppc for bug 273918 (diff)
downloadgentoo-2-0be322f68e795165565070606a953f876394811c.tar.gz
gentoo-2-0be322f68e795165565070606a953f876394811c.tar.bz2
gentoo-2-0be322f68e795165565070606a953f876394811c.zip
Fix building with gcc-4.4, bug #273400
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'games-board/eboard')
-rw-r--r--games-board/eboard/ChangeLog8
-rw-r--r--games-board/eboard/eboard-1.1.1.ebuild7
-rw-r--r--games-board/eboard/files/eboard-1.1.1-gcc44.patch11
3 files changed, 22 insertions, 4 deletions
diff --git a/games-board/eboard/ChangeLog b/games-board/eboard/ChangeLog
index ebfb942d862f..fbbd8517d2c4 100644
--- a/games-board/eboard/ChangeLog
+++ b/games-board/eboard/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-board/eboard
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.24 2009/05/20 16:35:15 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.25 2009/06/18 01:48:47 nyhm Exp $
+
+ 18 Jun 2009; Tristan Heaven <nyhm@gentoo.org> eboard-1.1.1.ebuild,
+ +files/eboard-1.1.1-gcc44.patch:
+ Fix building with gcc-4.4, bug #273400
20 May 2009; nixnut <nixnut@gentoo.org> eboard-1.1.1.ebuild:
ppc stable #266562
diff --git a/games-board/eboard/eboard-1.1.1.ebuild b/games-board/eboard/eboard-1.1.1.ebuild
index 740df032fcbc..2a4b19bc3c22 100644
--- a/games-board/eboard/eboard-1.1.1.ebuild
+++ b/games-board/eboard/eboard-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1.ebuild,v 1.6 2009/05/20 16:35:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1.ebuild,v 1.7 2009/06/18 01:48:47 nyhm Exp $
EAPI=2
inherit eutils games
@@ -31,12 +31,15 @@ src_prepare() {
-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \
configure \
|| die "sed configure failed"
- epatch "${FILESDIR}"/${P}-as-needed.patch
+ epatch \
+ "${FILESDIR}"/${P}-as-needed.patch \
+ "${FILESDIR}"/${P}-gcc44.patch
}
src_configure() {
# not an autoconf script
./configure \
+ --compiler="${CXX}" \
--prefix="${GAMES_PREFIX}" \
--data-prefix="${GAMES_DATADIR}" \
--man-prefix="/usr/share/man" \
diff --git a/games-board/eboard/files/eboard-1.1.1-gcc44.patch b/games-board/eboard/files/eboard-1.1.1-gcc44.patch
new file mode 100644
index 000000000000..43a26393d4f4
--- /dev/null
+++ b/games-board/eboard/files/eboard-1.1.1-gcc44.patch
@@ -0,0 +1,11 @@
+--- ntext.cc
++++ ntext.cc
+@@ -244,7 +244,7 @@
+ return;
+ }
+
+- p = strchr(text, '\n');
++ p = strchr((char *)text, '\n');
+ if (p!=NULL) {
+ *p = 0;
+ i = strlen(text);