Fix configure check for compilability of "cpuid" to work with hardened compiler - bug #143060

(Portage version: 2.1.1_pre4-r2)

5 files changed, 35 insertions, 4 deletions

diff --git a/media-libs/libgii/ChangeLog b/media-libs/libgii/ChangeLog
index 4035df83e8e1..c5f31140c183 100644
--- a/media-libs/libgii/ChangeLog
+++ b/media-libs/libgii/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libgii
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/ChangeLog,v 1.26 2006/05/17 14:37:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/ChangeLog,v 1.27 2006/08/07 13:29:26 kevquinn Exp $
+
+  07 Aug 2006; Kevin F. Quinn <kevquinn@gentoo.org>
+  +files/libgii-0.9.0-configure-cpuid-pic.patch, libgii-0.9.0.ebuild:
+  Fix configure check for compilability of "cpuid" to work with hardened
+  compiler - bug #143060
 
   17 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> libgii-0.9.0.ebuild:
   Stable on sparc
diff --git a/media-libs/libgii/files/digest-libgii-0.8.1 b/media-libs/libgii/files/digest-libgii-0.8.1
index f835539a33cc..42e4dc7f091e 100644
--- a/media-libs/libgii/files/digest-libgii-0.8.1
+++ b/media-libs/libgii/files/digest-libgii-0.8.1
@@ -1 +1,3 @@
 MD5 1e3f275c2a3ddcc662498918747277be libgii-0.8.1.tar.bz2 296487
+RMD160 5f6736c60d0d75a607bec3b85c45e2ab22c6bb4c libgii-0.8.1.tar.bz2 296487
+SHA256 7772e5dc07a10c11d05a7f07f1a9b1ea3a098ce59247dad267e41bb358b8dcfd libgii-0.8.1.tar.bz2 296487
diff --git a/media-libs/libgii/files/libgii-0.9.0-configure-cpuid-pic.patch b/media-libs/libgii/files/libgii-0.9.0-configure-cpuid-pic.patch
new file mode 100644
index 000000000000..8679fc255b8c
--- /dev/null
+++ b/media-libs/libgii/files/libgii-0.9.0-configure-cpuid-pic.patch
@@ -0,0 +1,11 @@
+--- acinclude.m4.orig	2006-08-07 15:07:00.000000000 +0200
++++ acinclude.m4	2006-08-07 15:07:24.000000000 +0200
+@@ -4610,7 +4610,7 @@
+ AC_DEFUN([AC_CC_CAN_CPUID],
+ [AC_CACHE_CHECK([whether $CC can assemble cpuid instruction], ac_cc_can_cpuid,
+         [ AC_TRY_LINK(,[unsigned long a,b,c,d,in; 
+-	asm("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
++	asm("pushl %%ebx; cpuid; movl %%ebx,%2; popl %%ebx": "=a" (a), "=r" (b), "=c" (c), "=d" (d) : "a" (in));
+ 	return d;],
+ 	ac_cc_can_cpuid="yes", ac_cc_can_cpuid="no")])
+ 	if test "x$ac_cc_can_cpuid" = "xyes"; then
diff --git a/media-libs/libgii/libgii-0.9.0.ebuild b/media-libs/libgii/libgii-0.9.0.ebuild
index 5b1b0328cb66..7318b25d5ebc 100644
--- a/media-libs/libgii/libgii-0.9.0.ebuild
+++ b/media-libs/libgii/libgii-0.9.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/libgii-0.9.0.ebuild,v 1.16 2006/05/17 14:37:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/libgii-0.9.0.ebuild,v 1.17 2006/08/07 13:29:26 kevquinn Exp $
 
-inherit eutils flag-o-matic libtool
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)"
 HOMEPAGE="http://www.ggi-project.org/"
@@ -22,8 +22,12 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-linux26-headers.patch
 	epatch ${FILESDIR}/${P}-gcc34.patch
+	# Modify configure check that tries to compile the cpuid
+	# instruction to work on hardened compiler.  Modified acinclude.m4.
+	epatch ${FILESDIR}/${P}-configure-cpuid-pic.patch
 
-	elibtoolize
+	# Since acinclude.m4 is modified, need to autoreconf.
+	eautoreconf
 }
 
 src_compile() {
diff --git a/media-libs/libgii/metadata.xml b/media-libs/libgii/metadata.xml
new file mode 100644
index 000000000000..907cc31e07f1
--- /dev/null
+++ b/media-libs/libgii/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
+