summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2006-07-29 07:51:27 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2006-07-29 07:51:27 +0000
commit27d7de6963fa9bc3529a58a2c4738ade9d6235fa (patch)
treef820f52f8d9e32b88c2625f5a1449e52ccfafc2c
parentNew nightlie. (diff)
downloadhistorical-27d7de6963fa9bc3529a58a2c4738ade9d6235fa.tar.gz
historical-27d7de6963fa9bc3529a58a2c4738ade9d6235fa.tar.bz2
historical-27d7de6963fa9bc3529a58a2c4738ade9d6235fa.zip
add patch for compiling under hardened from advancemame (bug #142021)
Package-Manager: portage-2.1.1_pre3-r5
-rw-r--r--games-emulation/advancemenu/ChangeLog7
-rw-r--r--games-emulation/advancemenu/Manifest22
-rw-r--r--games-emulation/advancemenu/advancemenu-2.4.13.ebuild13
-rw-r--r--games-emulation/advancemenu/files/advancemenu-2.4.13-pic.patch13
4 files changed, 42 insertions, 13 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/Manifest b/games-emulation/advancemenu/Manifest
index eaa1ad7997e7..076bd6628ae5 100644
--- a/games-emulation/advancemenu/Manifest
+++ b/games-emulation/advancemenu/Manifest
@@ -6,15 +6,19 @@ AUX advancemenu-2.4.13-gcc4.patch 714 RMD160 40913d10e1244b968e295f1e1a4b5598a66
MD5 21ffdf8035624bb0080b92b75b05e968 files/advancemenu-2.4.13-gcc4.patch 714
RMD160 40913d10e1244b968e295f1e1a4b5598a6668210 files/advancemenu-2.4.13-gcc4.patch 714
SHA256 edf070ce308dd80435809fbf1dce6d211c60622bee7d0308de8df02b8b89e22a files/advancemenu-2.4.13-gcc4.patch 714
-DIST advancemenu-2.4.13.tar.gz 2235347 RMD160 57d28f8dfb082e4416777707fce2fbb6c5aa72f4 SHA256 1e5099ff3aadc07153153a7c898c987b20f69a67740e05d6d21fc4582c4a685b
-EBUILD advancemenu-2.4.13.ebuild 2592 RMD160 7a2fe4a771e0ef5720f091728430581bb25b91e2 SHA1 945d637908edfdb0f5c8b6a8fa9589076aef5884 SHA256 80982bc56199df96f7b052df9070712a8c90192712cabb5fef991d8fc6d91bb6
-MD5 fb8c5a7d752cd74d640a3c5652f9f8ac advancemenu-2.4.13.ebuild 2592
-RMD160 7a2fe4a771e0ef5720f091728430581bb25b91e2 advancemenu-2.4.13.ebuild 2592
-SHA256 80982bc56199df96f7b052df9070712a8c90192712cabb5fef991d8fc6d91bb6 advancemenu-2.4.13.ebuild 2592
-MISC ChangeLog 3690 RMD160 fa0ddb240aaf44d3619c5532de6fed40f7756d26 SHA1 49716fa09165c845c4165a1cc68021a7811dfb2a SHA256 5354a8ae01f07c5491c03f75150d598fb04c47e1b500f4e4178e7c0b4f305a58
-MD5 5a3392f4ccbfd75536f2dc6cdb7d793f ChangeLog 3690
-RMD160 fa0ddb240aaf44d3619c5532de6fed40f7756d26 ChangeLog 3690
-SHA256 5354a8ae01f07c5491c03f75150d598fb04c47e1b500f4e4178e7c0b4f305a58 ChangeLog 3690
+AUX advancemenu-2.4.13-pic.patch 344 RMD160 5b28a46806f4245a9bd12f0d4e1a05de45df0053 SHA1 267d6abdaddb7caae51924456a68c98c21e260ed SHA256 d76016c2d6ef7c283d4fc6c4061e2cd4a6b1b094a4f30a9fa704f6c435c52a92
+MD5 893791a430019a7eb1c0eaf15758a93f files/advancemenu-2.4.13-pic.patch 344
+RMD160 5b28a46806f4245a9bd12f0d4e1a05de45df0053 files/advancemenu-2.4.13-pic.patch 344
+SHA256 d76016c2d6ef7c283d4fc6c4061e2cd4a6b1b094a4f30a9fa704f6c435c52a92 files/advancemenu-2.4.13-pic.patch 344
+DIST advancemenu-2.4.13.tar.gz 2235347 RMD160 57d28f8dfb082e4416777707fce2fbb6c5aa72f4 SHA1 961bec4ac853e15cf8d66154e6ae09ea8e67490e SHA256 1e5099ff3aadc07153153a7c898c987b20f69a67740e05d6d21fc4582c4a685b
+EBUILD advancemenu-2.4.13.ebuild 2732 RMD160 41d71e09a5babff022492135325d10460d4b3b35 SHA1 f23f340ca2ac20298b50449f7fc0dec3654a19ee SHA256 0ac1e8ef34766d80acf0344e7a5956287a329c02423879c285d12eaa0ca00bd3
+MD5 c05adadfcc7f343c46ac1f4bda1eb3ea advancemenu-2.4.13.ebuild 2732
+RMD160 41d71e09a5babff022492135325d10460d4b3b35 advancemenu-2.4.13.ebuild 2732
+SHA256 0ac1e8ef34766d80acf0344e7a5956287a329c02423879c285d12eaa0ca00bd3 advancemenu-2.4.13.ebuild 2732
+MISC ChangeLog 3920 RMD160 e42daf6133430cfad48e6dcdc972fd0c2fc59e70 SHA1 79f3d89380df01c86fecba7530604e789c664a37 SHA256 f804eb2f7149c3ae9db904befc9b051002ea2c536839b97cc7a5d26552b98fc2
+MD5 530a631a9abb233e8e5dfe47fcdf5aed ChangeLog 3920
+RMD160 e42daf6133430cfad48e6dcdc972fd0c2fc59e70 ChangeLog 3920
+SHA256 f804eb2f7149c3ae9db904befc9b051002ea2c536839b97cc7a5d26552b98fc2 ChangeLog 3920
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
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"