summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Redaelli <drizzt@gentoo.org>2009-02-25 17:10:09 +0000
committerTimothy Redaelli <drizzt@gentoo.org>2009-02-25 17:10:09 +0000
commit6abac8ec2c9592a0b5b6095d67e6cf9acf4756cd (patch)
treecb5cbda020edec47ffcdc609d1d9a11d5833b528 /games-emulation/zsnes
parentVersion bumped. (diff)
downloadgentoo-2-6abac8ec2c9592a0b5b6095d67e6cf9acf4756cd.tar.gz
gentoo-2-6abac8ec2c9592a0b5b6095d67e6cf9acf4756cd.tar.bz2
gentoo-2-6abac8ec2c9592a0b5b6095d67e6cf9acf4756cd.zip
Fix bug #257963 and #260247
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'games-emulation/zsnes')
-rw-r--r--games-emulation/zsnes/ChangeLog6
-rw-r--r--games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch11
-rw-r--r--games-emulation/zsnes/zsnes-1.51-r2.ebuild6
3 files changed, 21 insertions, 2 deletions
diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index bbc23d1c1c1d..134544ba3a46 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/zsnes
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.39 2009/02/02 16:41:45 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.40 2009/02/25 17:10:09 drizzt Exp $
+
+ 25 Feb 2009; Timothy Redaelli <drizzt@gentoo.org>
+ +files/zsnes-1.51-makefile.dep.patch, zsnes-1.51-r2.ebuild:
+ Fix bug #257963 and #260247
02 Feb 2009; <drizzt@gentoo.org> +files/zsnes-1.51-depbuild.patch,
zsnes-1.51-r2.ebuild:
diff --git a/games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch b/games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch
new file mode 100644
index 000000000000..e5c92847614f
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-makefile.dep.patch
@@ -0,0 +1,11 @@
+--- zsnes_1_51/src/Makefile.in.orig 2009-02-25 18:02:07.000000000 +0100
++++ zsnes_1_51/src/Makefile.in 2009-02-25 18:02:19.000000000 +0100
+@@ -133,7 +133,7 @@
+
+ include makefile.dep
+ makefile.dep: $(TOOL_D)/depbuild Makefile
+- $(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
++ $(TOOL_D)/depbuild "@CC@" "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
+
+ Makefile: Makefile.in config.status
+ ./config.status
diff --git a/games-emulation/zsnes/zsnes-1.51-r2.ebuild b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
index 55bdddbded41..768f6823afe7 100644
--- a/games-emulation/zsnes/zsnes-1.51-r2.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r2.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-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.2 2009/02/02 16:41:45 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.3 2009/02/25 17:10:09 drizzt Exp $
inherit eutils autotools flag-o-matic toolchain-funcs multilib games
@@ -38,6 +38,8 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-libao-thread.patch
# Fix bug #170108
epatch "${FILESDIR}"/${P}-depbuild.patch
+ # Fix bug #260247
+ epatch "${FILESDIR}"/${P}-makefile.dep.patch
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -54,6 +56,8 @@ src_compile() {
use amd64 && multilib_toolchain_setup x86
use custom-cflags || strip-flags
+ append-flags -U_FORTIFY_SOURCE #257963
+
egamesconf \
$(use_enable ao libao) \
$(use_enable png libpng) \