diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2007-07-02 17:39:11 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2007-07-02 17:39:11 +0000 |
| commit | 7774b5a33fb1e78a0cf83d860432a2969d527a70 (patch) | |
| tree | 6c3be26a63941e8ffe334ec2850afc26ffd27bab /games-fps/tenebrae | |
| parent | Stable on sparc wrt #183890 (diff) | |
| download | gentoo-2-7774b5a33fb1e78a0cf83d860432a2969d527a70.tar.gz gentoo-2-7774b5a33fb1e78a0cf83d860432a2969d527a70.tar.bz2 gentoo-2-7774b5a33fb1e78a0cf83d860432a2969d527a70.zip | |
remove need for an executable stack
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'games-fps/tenebrae')
| -rw-r--r-- | games-fps/tenebrae/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch | 36 | ||||
| -rw-r--r-- | games-fps/tenebrae/tenebrae-1.04.ebuild | 8 |
3 files changed, 46 insertions, 4 deletions
diff --git a/games-fps/tenebrae/ChangeLog b/games-fps/tenebrae/ChangeLog index 46b92e3ff052..9fd5a65ac844 100644 --- a/games-fps/tenebrae/ChangeLog +++ b/games-fps/tenebrae/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/tenebrae # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.9 2007/02/22 00:30:49 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.10 2007/07/02 17:39:11 nyhm Exp $ + + 02 Jul 2007; Tristan Heaven <nyhm@gentoo.org> + +files/tenebrae-1.04-exec-stack.patch, tenebrae-1.04.ebuild: + remove need for an executable stack 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch b/games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch new file mode 100644 index 000000000000..bc74e951fe6a --- /dev/null +++ b/games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch @@ -0,0 +1,36 @@ +--- math.s ++++ math.s +@@ -416,3 +416,6 @@ + call C(BOPS_Error) + + #endif // id386 ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +--- snd_mixa.s ++++ snd_mixa.s +@@ -216,3 +216,6 @@ + + #endif // id386 + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +--- sys_dosa.s ++++ sys_dosa.s +@@ -93,3 +93,6 @@ + + ret + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +--- worlda.s ++++ worlda.s +@@ -142,3 +142,6 @@ + + #endif // id386 + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/games-fps/tenebrae/tenebrae-1.04.ebuild b/games-fps/tenebrae/tenebrae-1.04.ebuild index 378b9f0de6a2..a743066bf3e5 100644 --- a/games-fps/tenebrae/tenebrae-1.04.ebuild +++ b/games-fps/tenebrae/tenebrae-1.04.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.11 2006/12/05 18:02:09 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.12 2007/07/02 17:39:11 nyhm Exp $ #ECVS_SERVER="cvs.tenebrae.sourceforge.net:/cvsroot/tenebrae" #ECVS_MODULE="tenebrae_0" @@ -38,7 +38,9 @@ src_unpack() { cvs_src_unpack fi cd tenebrae_0 - epatch "${FILESDIR}"/${PV}-glhax.patch + epatch \ + "${FILESDIR}"/${PV}-glhax.patch \ + "${FILESDIR}"/${P}-exec-stack.patch cd linux sed "s:-mpentiumpro -O6:${CFLAGS}:" Makefile.i386linux > Makefile #if use sdl ; then |