summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-06-08 09:42:28 +0000
committerMike Frysinger <vapier@gentoo.org>2006-06-08 09:42:28 +0000
commit5cf1be91758f3aa840043198c4a5a12aceaecd7b (patch)
treed0adb5a3da541b53a383237bdcbdaea0a6538c73 /media-libs/libsdl
parentRename include file so it doesnt get compiled in #134632 by Martin Wegner. (diff)
downloadgentoo-2-5cf1be91758f3aa840043198c4a5a12aceaecd7b.tar.gz
gentoo-2-5cf1be91758f3aa840043198c4a5a12aceaecd7b.tar.bz2
gentoo-2-5cf1be91758f3aa840043198c4a5a12aceaecd7b.zip
Make sure yasm doesnt generate exec stacks #134632 by Martin Wegner.
(Portage version: 2.1_rc4-r3)
Diffstat (limited to 'media-libs/libsdl')
-rw-r--r--media-libs/libsdl/ChangeLog5
-rw-r--r--media-libs/libsdl/libsdl-1.2.10.ebuild13
2 files changed, 16 insertions, 2 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 38061eaf03ad..eca3bc223e3f 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libsdl
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.103 2006/06/08 09:41:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.104 2006/06/08 09:42:28 vapier Exp $
+
+ 08 Jun 2006; Mike Frysinger <vapier@gentoo.org> libsdl-1.2.10.ebuild:
+ Make sure yasm doesnt generate exec stacks #134632 by Martin Wegner.
08 Jun 2006; Mike Frysinger <vapier@gentoo.org>
files/libsdl-1.2.10-PIC-hidden-symbols.patch:
diff --git a/media-libs/libsdl/libsdl-1.2.10.ebuild b/media-libs/libsdl/libsdl-1.2.10.ebuild
index 6aca6043f01d..bfc47dac5fea 100644
--- a/media-libs/libsdl/libsdl-1.2.10.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.10.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/media-libs/libsdl/libsdl-1.2.10.ebuild,v 1.2 2006/05/29 18:57:35 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.10.ebuild,v 1.3 2006/06/08 09:42:28 vapier Exp $
inherit flag-o-matic toolchain-funcs eutils libtool
@@ -80,6 +80,17 @@ src_unpack() {
epatch "${FILESDIR}"/libsdl-1.2.10-PIC-hidden-symbols.patch
epatch "${FILESDIR}/${P}"-noxinerama.patch
+ # add yasm-compatible defines to nasm code (hopefully we
+ # can get this killed soonish)
+ local f
+ for f in "${S}"/src/hermes/*.asm ; do
+ cat <<-EOF >> "${f}"
+ %ifidn __YASM_OBJFMT__,elf
+ section ".note.GNU-stack" noalloc noexec nowrite progbits
+ %endif
+ EOF
+ done
+
./autogen.sh || die "autogen failed"
elibtoolize
}