diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2006-07-29 07:51:27 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2006-07-29 07:51:27 +0000 |
| commit | bf8044a98dff2366c91c5fc410dbf40927b42d9f (patch) | |
| tree | fbdc655a9e64ade0dedf6270af5eaa37f5e30c12 /games-emulation | |
| parent | New nightlie. (diff) | |
| download | gentoo-2-bf8044a98dff2366c91c5fc410dbf40927b42d9f.tar.gz gentoo-2-bf8044a98dff2366c91c5fc410dbf40927b42d9f.tar.bz2 gentoo-2-bf8044a98dff2366c91c5fc410dbf40927b42d9f.zip | |
add patch for compiling under hardened from advancemame (bug #142021)
(Portage version: 2.1.1_pre3-r5)
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/advancemenu/ChangeLog | 7 | ||||
| -rw-r--r-- | games-emulation/advancemenu/advancemenu-2.4.13.ebuild | 13 | ||||
| -rw-r--r-- | games-emulation/advancemenu/files/advancemenu-2.4.13-pic.patch | 13 |
3 files changed, 29 insertions, 4 deletions
diff --git a/games-emulation/advancemenu/ChangeLog b/games-emulation/advancemenu/ChangeLog index 49795cffd78b..f0ad3d0ca214 100644 --- a/games-emulation/advancemenu/ChangeLog +++ b/games-emulation/advancemenu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-emulation/advancemenu # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.23 2006/03/25 05:21:17 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.24 2006/07/29 07:51:27 mr_bones_ Exp $ + + 29 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org> + +files/advancemenu-2.4.13-pic.patch, advancemenu-2.4.13.ebuild: + add patch for compiling under hardened from advancemame (bug #142021); + also prevent premature stripping *advancemenu-2.4.13 (25 Mar 2006) diff --git a/games-emulation/advancemenu/advancemenu-2.4.13.ebuild b/games-emulation/advancemenu/advancemenu-2.4.13.ebuild index 8be05cd1ffa7..ca09460ca14e 100644 --- a/games-emulation/advancemenu/advancemenu-2.4.13.ebuild +++ b/games-emulation/advancemenu/advancemenu-2.4.13.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/advancemenu/advancemenu-2.4.13.ebuild,v 1.2 2006/07/28 00:57:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.4.13.ebuild,v 1.3 2006/07/29 07:51:27 mr_bones_ Exp $ inherit eutils games @@ -29,9 +29,16 @@ src_unpack() { unpack ${A} cd "${S}" # gcc4 patch - bug #120712 + # pic patch - bug #142021 epatch \ "${FILESDIR}"/${P}-alsa-pkg-config.patch \ - "${FILESDIR}"/${P}-gcc4.patch + "${FILESDIR}"/${P}-gcc4.patch \ + "${FILESDIR}"/${P}-pic.patch + sed -i \ + -e 's/"-s"//' \ + configure \ + || die "sed failed" + use x86 && ln -s $(which nasm) "${T}/${CHOST}-nasm" use sdl && ln -s $(which sdl-config) "${T}/${CHOST}-sdl-config" use truetype && ln -s $(which freetype-config) "${T}/${CHOST}-freetype-config" @@ -54,7 +61,7 @@ src_compile() { $(use_enable x86 asm) \ $(use_enable zlib) \ || die - emake || die "emake failed" + STRIPPROG=true emake || die "emake failed" } src_install() { diff --git a/games-emulation/advancemenu/files/advancemenu-2.4.13-pic.patch b/games-emulation/advancemenu/files/advancemenu-2.4.13-pic.patch new file mode 100644 index 000000000000..049befbfac2c --- /dev/null +++ b/games-emulation/advancemenu/files/advancemenu-2.4.13-pic.patch @@ -0,0 +1,13 @@ +--- ./advance/blit/blit.c.orig 2004-12-19 01:01:46.039956536 -0500 ++++ ./advance/blit/blit.c 2004-12-19 01:01:19.566981040 -0500 +@@ -28,6 +28,10 @@ + * do so, delete this exception statement from your version. + */ + ++#if defined(USE_ASM_INLINE) && defined(__PIC__) ++# undef USE_ASM_INLINE ++#endif ++ + #include "portable.h" + + #include "blit.h" |