diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-01-10 01:14:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-10 01:14:17 +0000 |
| commit | cf029f220d9fc4ebfd60f25f4adcafb46dcc06e5 (patch) | |
| tree | 20c962ff447f565d9012478a1f5d77ec1b8e6d13 /games-emulation | |
| parent | Added a patch to fix fullscreen requests thanks to Bernard Cafarelli <voyageu... (diff) | |
| download | historical-cf029f220d9fc4ebfd60f25f4adcafb46dcc06e5.tar.gz historical-cf029f220d9fc4ebfd60f25f4adcafb46dcc06e5.tar.bz2 historical-cf029f220d9fc4ebfd60f25f4adcafb46dcc06e5.zip | |
Build nestra without an executable stack.
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/nestra/ChangeLog | 6 | ||||
| -rw-r--r-- | games-emulation/nestra/Manifest | 11 | ||||
| -rw-r--r-- | games-emulation/nestra/files/nestra-0.66-exec-stack.patch | 10 | ||||
| -rw-r--r-- | games-emulation/nestra/nestra-0.66-r1.ebuild | 9 |
4 files changed, 26 insertions, 10 deletions
diff --git a/games-emulation/nestra/ChangeLog b/games-emulation/nestra/ChangeLog index f4445ca8cf57..e0edb6fb40ae 100644 --- a/games-emulation/nestra/ChangeLog +++ b/games-emulation/nestra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/nestra # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/ChangeLog,v 1.8 2006/01/10 01:00:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/ChangeLog,v 1.9 2006/01/10 01:14:17 vapier Exp $ + + 10 Jan 2006; Mike Frysinger <vapier@gentoo.org> + +files/nestra-0.66-exec-stack.patch, nestra-0.66-r1.ebuild: + Build nestra without an executable stack. 10 Jan 2006; Mike Frysinger <vapier@gentoo.org> nestra-0.66-r1.ebuild: Fix LDFLAGS support. diff --git a/games-emulation/nestra/Manifest b/games-emulation/nestra/Manifest index 9649f28a88a1..85da259424bb 100644 --- a/games-emulation/nestra/Manifest +++ b/games-emulation/nestra/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 703916c76156dcef8f6e7e7f76b5f933 ChangeLog 1110 +MD5 d098e08e1bce340c7ddd4471c30b4146 ChangeLog 1267 MD5 1b72c901305b3f39e947ffbe00b7a13e files/digest-nestra-0.66-r1 126 +MD5 0ce4563cf54ce668376ab9877fffda1e files/nestra-0.66-exec-stack.patch 235 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 cac77da69ac8986a87706bbc759427e9 nestra-0.66-r1.ebuild 1379 +MD5 134f0435d6194602b3bd25c1b92eb56c nestra-0.66-r1.ebuild 1464 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDwwd42+ySkm8kpY0RArxEAKCTrRhBK2sgLbntK7hS7dLQ7cpzNACfezkE -IDD/LrB2kOkIAm8u0Mre5fU= -=12yD +iD8DBQFDwwq/2+ySkm8kpY0RAi+xAJ94+S7IELrDlNgLd/VD3eXZ/krCNQCfSqej +QKeeA4lEnSa0a8Qjcv/ogAk= +=pbB7 -----END PGP SIGNATURE----- diff --git a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch b/games-emulation/nestra/files/nestra-0.66-exec-stack.patch new file mode 100644 index 000000000000..f5c662e22600 --- /dev/null +++ b/games-emulation/nestra/files/nestra-0.66-exec-stack.patch @@ -0,0 +1,10 @@ +--- x86.S.orig 2006-01-09 20:02:58.000000000 -0500 ++++ x86.S 2006-01-09 20:03:38.000000000 -0500 +@@ -1458,3 +1458,7 @@ + leal 0x1(%eax),%ebx + popl %eax + jmp i_next ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif diff --git a/games-emulation/nestra/nestra-0.66-r1.ebuild b/games-emulation/nestra/nestra-0.66-r1.ebuild index d589be975546..91edf7d65a1e 100644 --- a/games-emulation/nestra/nestra-0.66-r1.ebuild +++ b/games-emulation/nestra/nestra-0.66-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/nestra-0.66-r1.ebuild,v 1.10 2006/01/10 01:00:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/nestra/nestra-0.66-r1.ebuild,v 1.11 2006/01/10 01:14:17 vapier Exp $ inherit eutils toolchain-funcs flag-o-matic games @@ -27,7 +27,7 @@ pkg_setup() { export ABI=x86 if has_m32 ; then append-flags -m32 - append-ldflags -m elf_i386 + append-ldflags -Wl,-m,elf_i386 else eerror "Your compiler seems to be unable to compile 32bit code." eerror "Make sure you compile gcc with:" @@ -40,9 +40,10 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" - epatch "${WORKDIR}/${PATCH}" + epatch "${WORKDIR}"/${PATCH} "${FILESDIR}"/${P}-exec-stack.patch + append-ldflags -Wl,-z,noexecstack sed -i \ - -e "s:-L/usr/X11R6/lib::" \ + -e "s:-L/usr/X11R6/lib:${LDFLAGS}:" \ -e 's:-O2 ::' \ -e "s:gcc:$(tc-getCC) ${CFLAGS}:" \ -e "s:ld:$(tc-getLD) $(raw-ldflags):" \ |