summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-08-08 00:36:48 +0000
committerMike Frysinger <vapier@gentoo.org>2005-08-08 00:36:48 +0000
commitf67ec6dabb918b93f64429c1479c6fec328c2442 (patch)
treec62f43e54b8600d718c3128312d793bf703cc416 /games-emulation
parentadd usb to DEPEND (diff)
downloadhistorical-f67ec6dabb918b93f64429c1479c6fec328c2442.tar.gz
historical-f67ec6dabb918b93f64429c1479c6fec328c2442.tar.bz2
historical-f67ec6dabb918b93f64429c1479c6fec328c2442.zip
Fix PIC usage #101627 by Jens Pranaitis.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/ps2emu-gssoft/ChangeLog6
-rw-r--r--games-emulation/ps2emu-gssoft/Manifest11
-rw-r--r--games-emulation/ps2emu-gssoft/files/ps2emu-gssoft-0.9-PIC.patch23
-rw-r--r--games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild3
4 files changed, 36 insertions, 7 deletions
diff --git a/games-emulation/ps2emu-gssoft/ChangeLog b/games-emulation/ps2emu-gssoft/ChangeLog
index 7b85d45be5ab..71580bc097d4 100644
--- a/games-emulation/ps2emu-gssoft/ChangeLog
+++ b/games-emulation/ps2emu-gssoft/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/ps2emu-gssoft
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ChangeLog,v 1.7 2005/08/07 07:13:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ChangeLog,v 1.8 2005/08/08 00:36:48 vapier Exp $
+
+ 08 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/ps2emu-gssoft-0.9-PIC.patch, ps2emu-gssoft-0.9.ebuild:
+ Fix PIC usage #101627 by Jens Pranaitis.
*ps2emu-gssoft-0.9 (07 Aug 2005)
diff --git a/games-emulation/ps2emu-gssoft/Manifest b/games-emulation/ps2emu-gssoft/Manifest
index af242210a4d8..314f6f445335 100644
--- a/games-emulation/ps2emu-gssoft/Manifest
+++ b/games-emulation/ps2emu-gssoft/Manifest
@@ -1,17 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 dbdcb07b663d337ea3ad2318e2e53a84 ps2emu-gssoft-0.9.ebuild 1015
+MD5 97046644bb24ff219d552e3540d8541b ps2emu-gssoft-0.9.ebuild 1052
MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
MD5 bff04080295f4bf58991f54ae1b0ff30 ps2emu-gssoft-0.6.1.ebuild 878
-MD5 3208c718213ec16f2fe79665f8518707 ChangeLog 664
+MD5 cee96a0b2f84d6069c6c8f1c5ada4286 ChangeLog 822
+MD5 0b00447cf9975807680c81734370150e files/ps2emu-gssoft-0.9-PIC.patch 534
MD5 a1009be2d1e95d9ceaacdb2f481c82fc files/digest-ps2emu-gssoft-0.6.1 60
MD5 630aac09a02e38ccd4fd77073b968dae files/digest-ps2emu-gssoft-0.9 58
MD5 150b0f64695512493376ada8e4401757 files/ps2emu-gssoft-0.9-gentoo.patch 850
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFC9bn1gIKl8Uu19MoRAlJoAJ9zu9R+oDstB1qS9F672PkuWxLkCwCfWDY3
-BY4dGZ7gw5iLvEQMKQNq88k=
-=Xmi5
+iD8DBQFC9qk2gIKl8Uu19MoRAjmGAJsG23YyvXuO9dIidyszq3tA5HKrLwCfaX+N
+HRaQIFbWDMhQHpnj4yh6Yxk=
+=HZOA
-----END PGP SIGNATURE-----
diff --git a/games-emulation/ps2emu-gssoft/files/ps2emu-gssoft-0.9-PIC.patch b/games-emulation/ps2emu-gssoft/files/ps2emu-gssoft-0.9-PIC.patch
new file mode 100644
index 000000000000..91b747e8fb80
--- /dev/null
+++ b/games-emulation/ps2emu-gssoft/files/ps2emu-gssoft-0.9-PIC.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/101627
+--- Src/x86/ix86_cpudetect.c
++++ Src/x86/ix86_cpudetect.c
+@@ -151,16 +151,18 @@
+ }
+
+ __asm__ __volatile__ (
++ "push %%ebx\n"
+ "mov %4, %%eax\n"
+ "cpuid\n"
+ "mov %%eax, %0\n"
+ "mov %%ebx, %1\n"
+ "mov %%ecx, %2\n"
+ "mov %%edx, %3\n"
++ "pop %%ebx\n"
+ : "=m" (regs[0]), "=m" (regs[1]),
+ "=m" (regs[2]), "=m" (regs[3])
+ : "m"(cmd)
+- : "eax", "ebx", "ecx", "edx"
++ : "eax", "ecx", "edx"
+ );
+
+ return 0;
diff --git a/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild b/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild
index 22723d76390d..16e9799b20e6 100644
--- a/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild
+++ b/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild,v 1.2 2005/08/07 07:35:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/ps2emu-gssoft/ps2emu-gssoft-0.9.ebuild,v 1.3 2005/08/08 00:36:48 vapier Exp $
inherit games
@@ -27,6 +27,7 @@ src_unpack() {
cd "${S}"
sed -i 's:-O2 -fomit-frame-pointer -ffast-math:$(OPTFLAGS):' Src/Linux/Makefile || die
epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-PIC.patch
}
src_compile() {