Fix by Radoslaw Madej for PIC issues with cpuid #270388 by Richard Scott. Also fix $ROOT checking in pkg_preinst.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 66 insertions, 18 deletions

diff --git a/sys-apps/x86info/ChangeLog b/sys-apps/x86info/ChangeLog
index 32fe21fd953a..7c12db2065ee 100644
--- a/sys-apps/x86info/ChangeLog
+++ b/sys-apps/x86info/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/x86info
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.27 2009/07/05 20:11:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.28 2009/08/15 23:41:13 vapier Exp $
+
+  15 Aug 2009; Mike Frysinger <vapier@gentoo.org> x86info-1.24-r2.ebuild,
+  +files/x86info-1.24-pic.patch:
+  Fix by Radoslaw Madej for PIC issues with cpuid #270388 by Richard Scott.
+  Also fix $ROOT checking in pkg_preinst.
 
 *x86info-1.24-r2 (05 Jul 2009)
 
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 401a45e915be..b8473d326ea7 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.21-pic.patch 717 RMD160 0bcba1f80eb887b5353d24ed1c142afebe7725f8 SHA1 a83df63cdd6b285f68b300872ba6d6b8fceea50b SHA256 af3dfe679472819d482df5b2c80dc8133b944787dbb13841fe22d30c1f668948
+AUX x86info-1.24-pic.patch 573 RMD160 877eafab4da9063a7e9b8a913014773d6c5d4486 SHA1 32f50cc4abe5dc46ebdd88be6b87ef5b6156f506 SHA256 7aeb0233c7a53b07fecbf84a848520cfdcf36a7fde6a8d00bf5684a58cba27af
 AUX x86info-modules.conf-rc 330 RMD160 edd79a6436a85eb4361a081538de3f3e7e1c6ef1 SHA1 798919c8bda83ae89c1f3eb2e398598e37c809f2 SHA256 ca22974920a096572a7fccde55db738591f03b95a2b7b85403ab9771647824a2
 DIST x86info-1.21.tgz 59354 RMD160 6eeb9f63d11117a536282f75af871579a9472a02 SHA1 3e0071ae508d5944a21ee0fafa07edf5f45e82bd SHA256 2bb3fb33832e073452657adf9f946b2d73d32c7382382f2136750c29d2637fe1
 DIST x86info-1.24.tgz 78874 RMD160 e6d9db7933f48a27fe88724f385c568fcc7cbec2 SHA1 6401898ac768e3c7fbe2f6b69fc7ce9fc27e1118 SHA256 6cc44be6cabf32d77fde33f994899f7c917580f6595f656d6d1218cea131a575
 EBUILD x86info-1.21.ebuild 1180 RMD160 d6430d463de057178e2ecd39c08dd0a737c9b047 SHA1 c4f5c96ce7305d846327fc0db2aa0c7b72045ea6 SHA256 c44f5252193f6268581b0c1c2f54897bc1d2ef33fc562f917e55061eed500964
 EBUILD x86info-1.24-r1.ebuild 1484 RMD160 a46ef4efc1d7ba924207c84722b3de5bd31ca762 SHA1 6a4f597cb5e298fe08638b0d2e79229a2be602bc SHA256 a2d06cf831a63710944386edcc14ef01a281ecdd549b9dbbfe195861a7a7af64
-EBUILD x86info-1.24-r2.ebuild 1837 RMD160 fa11d7eb65bd007b44de8d17063a41875e5dce57 SHA1 483ba73262fb0b7bfc1270f8429557c2eaf90862 SHA256 833c70146769d58de912b1ea78774e933cd41d9e53cbdda5e2d865f469f9b8ce
-MISC ChangeLog 3789 RMD160 2c9d554b9252a81db5d442eee936130a2f37aa14 SHA1 f071cfc320565ded6c22c3df9adbd9b295dd3704 SHA256 13c51341a8ed78d82447faf65f9c422e55b5110d202872d38ce29218c25881f1
+EBUILD x86info-1.24-r2.ebuild 1837 RMD160 514a5f7239898e03fc25387747e31ba73017cb8f SHA1 2b4856176f6a49ec6dd607cc8d14c02689e36b1b SHA256 2e038db9aa4d013721e67d91683c83e276891b26d42e6f29001662e16e867603
+MISC ChangeLog 4014 RMD160 94bf504063c303a83288b81162b61cd1d0916b84 SHA1 05dd0e6c07353f945f404e930feb53a192379fb1 SHA256 408f2cb4e9413f65a8ede5f756cff09a231e23b4a4691f0bd3debf55f07e67b6
 MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkqHR54ACgkQlPl3HsVfCDrUWACeJIENsmzBhiKC3yeCpSf+Gpjk
+s5YAnRufjyf6YedoxW2U9LZ2gMKilSM/
+=2Ugd
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/x86info/files/x86info-1.24-pic.patch b/sys-apps/x86info/files/x86info-1.24-pic.patch
new file mode 100644
index 000000000000..5cbd3a586f8e
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.24-pic.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/270388
+
+--- cpuid.c
++++ cpuid.c
+@@ -62,12 +62,28 @@
+ 		sched_setaffinity(getpid(), sizeof(set), &set);
+ 	}
+ 
++#ifdef __PIC__
++	/* GCC on i386 bitches if you clobber ebx.  So hide it behind
++	 * gcc's back. */
++	asm(
++		"movl %%ebx,%%edi\n"
++		"cpuid\n"
++		"movl %%ebx,%1\n"
++		"movl %%edi,%%ebx\n"
++		: "=a" (a),
++		  "=m" (b),
++		  "+c" (c),
++		  "=d" (d)
++		: "0" ((unsigned int)idx)
++		: "edi");
++#else
+ 	asm("cpuid"
+ 		: "=a" (a),
+ 		  "=b" (b),
+ 		  "+c" (c),
+ 		  "=d" (d)
+ 		: "0" ((unsigned int)idx));
++#endif
+ 
+ 	if (eax!=NULL)
+ 		*eax = a;
diff --git a/sys-apps/x86info/x86info-1.24-r2.ebuild b/sys-apps/x86info/x86info-1.24-r2.ebuild
index 09826a75b39e..d80bc3fa9d60 100644
--- a/sys-apps/x86info/x86info-1.24-r2.ebuild
+++ b/sys-apps/x86info/x86info-1.24-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.24-r2.ebuild,v 1.2 2009/07/10 20:45:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.24-r2.ebuild,v 1.3 2009/08/15 23:41:13 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,26 +20,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/1.21-pic.patch
+	epatch "${FILESDIR}"/${P}-pic.patch #270388
 	sed -i -e 's:$(CFLAGS) -o x86:$(LDFLAGS) $(CFLAGS) -o x86:' \
 		Makefile || die "I don't want your LDFLAGS."
 }
 
 src_compile() {
 	emake x86info CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-pkg_preinst() {
-	if [[ -a /etc/modules.d/x86info ]] && [[ ! -a /etc/modprobe.d/x86info ]]; then
-		elog "Moving old x86info configuration in modules.d to new"
-		elog "location in modprobe.d in /etc/"
-		mv "${ROOT}"/etc/{modules,modprobe}.d/x86info
-	fi
-	if [[ -a /etc/modprobe.d/x86info ]] && [[ ! -a /etc/modprobe.d/x86info.conf ]]; then
-		elog "Moving old x86info configuration in modprobe.d to"
-		elog "new naming scheme with trailing .conf"
-		mv "${ROOT}"/etc/modprobe.d/x86info{,.conf}
-	fi
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" || die "emake failed"
 }
 
 src_install() {
@@ -55,6 +43,17 @@ src_install() {
 	prepalldocs
 }
 
+pkg_preinst() {
+	if [ -a "${ROOT}"/etc/modules.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info ] ; then
+		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
+		mv "${ROOT}"/etc/{modules,modprobe}.d/x86info
+	fi
+	if [ -a "${ROOT}"/etc/modprobe.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info.conf ] ; then
+		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
+		mv "${ROOT}"/etc/modprobe.d/x86info{,.conf}
+	fi
+}
+
 pkg_postinst() {
 	ewarn "Your kernel must be built with the following options"
 	ewarn "set to Y or M"