Only include alloca.h for gcc on glibc sytsems, #183295 thanks to Nathan Smith.

Package-Manager: portage-2.1.3_rc6

4 files changed, 32 insertions, 20 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index f941d7cb83fb..18a2c79ffd3c 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.108 2007/07/06 05:09:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.109 2007/07/06 09:56:12 uberlord Exp $
+
+  06 Jul 2007; Roy Marples <uberlord@gentoo.org>
+  +files/pciutils-2.2.6-alloca.patch, pciutils-2.2.6-r1.ebuild:
+  Only include alloca.h for gcc on glibc sytsems, #183295 thanks to Nathan Smith.
 
 *pciutils-2.2.6-r1 (06 Jul 2007)
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 38ee33f6db54..d649a383fadb 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pcimodules-pciutils-2.2.0.patch 10855 RMD160 3de80ff3017c6582af5d83c1c0e46986abe1b47d SHA1 65d96761e1a8ce2ed7d78b0a639a31a5eb972b39 SHA256 e80acd88775c6ed2af05e751d28aeddfa6836a0465f187a35d7ae9e5224827a5
 MD5 7460ee88d1643e8a87d04438bd4f5fdd files/pcimodules-pciutils-2.2.0.patch 10855
 RMD160 3de80ff3017c6582af5d83c1c0e46986abe1b47d files/pcimodules-pciutils-2.2.0.patch 10855
@@ -25,6 +22,10 @@ AUX pciutils-2.2.4-update-pciids.patch 1490 RMD160 a067c73abf5ed7d166c257db13031
 MD5 71ccc90ba85f24195c48355028ef9ac1 files/pciutils-2.2.4-update-pciids.patch 1490
 RMD160 a067c73abf5ed7d166c257db13031cab889c1ba1 files/pciutils-2.2.4-update-pciids.patch 1490
 SHA256 fd459489edd1aa9edd5c34451d97fb39e0f2da86a078305e6ff1afe66415404d files/pciutils-2.2.4-update-pciids.patch 1490
+AUX pciutils-2.2.6-alloca.patch 244 RMD160 8535f0e9a0e4198d2d29f1999b92a8898dca119b SHA1 630713aa48b3fd1ccfb614122de6b70d87b0b0d0 SHA256 f2cdc63832aa7ec8a374c1b5943e054236438673fa02b30a9d2fcf51eb080a20
+MD5 3125899a0f4633c0b858c7072e1365c6 files/pciutils-2.2.6-alloca.patch 244
+RMD160 8535f0e9a0e4198d2d29f1999b92a8898dca119b files/pciutils-2.2.6-alloca.patch 244
+SHA256 f2cdc63832aa7ec8a374c1b5943e054236438673fa02b30a9d2fcf51eb080a20 files/pciutils-2.2.6-alloca.patch 244
 AUX pciutils-2.2.6-link.patch 304 RMD160 3114fd9c186fb8aaf6df05e8f5656aab9b33fd1c SHA1 4cbc4feee5e7595aa072129258e1783a40281bde SHA256 ad9bfac0bec27ecd9c019d9eb935922e293d122b39ab9fff05072b80ae270ad2
 MD5 002432ae027f2cbcd38c267970d1032a files/pciutils-2.2.6-link.patch 304
 RMD160 3114fd9c186fb8aaf6df05e8f5656aab9b33fd1c files/pciutils-2.2.6-link.patch 304
@@ -44,14 +45,14 @@ EBUILD pciutils-2.2.4-r3.ebuild 1689 RMD160 7c42c4d297d7a715464ff1d640be307a84bb
 MD5 88970589e4845b73fdb4902c2f0b0ede pciutils-2.2.4-r3.ebuild 1689
 RMD160 7c42c4d297d7a715464ff1d640be307a84bb85e2 pciutils-2.2.4-r3.ebuild 1689
 SHA256 67313b17b7b59bd3d35aa87501102d732c2d0f783029945c51c564d9482a9fbb pciutils-2.2.4-r3.ebuild 1689
-EBUILD pciutils-2.2.6-r1.ebuild 1385 RMD160 a0c6a1eb9bb64368068cb89063b29a72cbdaf6f5 SHA1 c73162971fe96b1811e71f76b657de8b178b4498 SHA256 17ee5193458aa088e0473f042174fb012a7f5df211b3f107315b5830b6ebafe3
-MD5 33f4aa53f437a7a324eb54b5b82f2ae4 pciutils-2.2.6-r1.ebuild 1385
-RMD160 a0c6a1eb9bb64368068cb89063b29a72cbdaf6f5 pciutils-2.2.6-r1.ebuild 1385
-SHA256 17ee5193458aa088e0473f042174fb012a7f5df211b3f107315b5830b6ebafe3 pciutils-2.2.6-r1.ebuild 1385
-MISC ChangeLog 14304 RMD160 7f1824ce9cdfab47d6e238c557297bbdc734d437 SHA1 12c4a13d42b5f5c1a6fc3a48bea2c91393e8d47f SHA256 adc735770b34189a911f01b00d54e5e15d74c600b733f1f66f16788815aad07d
-MD5 1c944e36f56262735b98d87e99de41b6 ChangeLog 14304
-RMD160 7f1824ce9cdfab47d6e238c557297bbdc734d437 ChangeLog 14304
-SHA256 adc735770b34189a911f01b00d54e5e15d74c600b733f1f66f16788815aad07d ChangeLog 14304
+EBUILD pciutils-2.2.6-r1.ebuild 1434 RMD160 797e28418d0f9791208220969fe8701862dbba0e SHA1 653cd93a1cf6cdda6d84a289714dc274bd42d3da SHA256 55ccb2b10aa44559818300881d27ecaf0b690e79d170eb08d8e1985e8b3ada9c
+MD5 df3816838ddc26913201d9ab5a31a79d pciutils-2.2.6-r1.ebuild 1434
+RMD160 797e28418d0f9791208220969fe8701862dbba0e pciutils-2.2.6-r1.ebuild 1434
+SHA256 55ccb2b10aa44559818300881d27ecaf0b690e79d170eb08d8e1985e8b3ada9c pciutils-2.2.6-r1.ebuild 1434
+MISC ChangeLog 14502 RMD160 68ede38d6bea4f360d18e70c1ce8b7e0d646c370 SHA1 c1100ab2821fd50bf0a9f7e5fbda46101631b9c4 SHA256 eacdee743026382926757407fac2d8b4f40e3e1a9956453bf27e86b62164bf05
+MD5 0077b3d995590741046d96c4863e8c51 ChangeLog 14502
+RMD160 68ede38d6bea4f360d18e70c1ce8b7e0d646c370 ChangeLog 14502
+SHA256 eacdee743026382926757407fac2d8b4f40e3e1a9956453bf27e86b62164bf05 ChangeLog 14502
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -65,10 +66,3 @@ SHA256 ae83c0072554b83b7519828f5470144cfa69ca5605ed319117d5400896258701 files/di
 MD5 c0e80db417149bdc1a4715bb0e1a241c files/digest-pciutils-2.2.6-r1 244
 RMD160 4f0e0ce21dcdad6030e9430ad759638772403ce6 files/digest-pciutils-2.2.6-r1 244
 SHA256 fc18c3f1d11767824326e47279a1b087a9324a8ed2d4e5eedb44397a5e487206 files/digest-pciutils-2.2.6-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGjc8Vp/wUKkr7RBoRAimSAKCWdc2b6Hg/sGe9lPN659b6aIiqAQCg3rpP
-Gfej9whV/L6UVwL76gVvvHE=
-=oPgb
------END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/pciutils-2.2.6-alloca.patch b/sys-apps/pciutils/files/pciutils-2.2.6-alloca.patch
new file mode 100644
index 000000000000..78ef4b9c1835
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-2.2.6-alloca.patch
@@ -0,0 +1,13 @@
+diff -ur a/lspci.c b/lspci.c
+--- a/lspci.c	2007-03-30 10:56:35 +0100
++++ b/lspci.c	2007-07-06 10:31:54 +0100
+@@ -60,7 +60,9 @@
+  */
+ 
+ #ifdef __GNUC__
++#ifdef __GLIBC__
+ #include <alloca.h>
++#endif
+ #else
+ #undef alloca
+ #define alloca xmalloc
diff --git a/sys-apps/pciutils/pciutils-2.2.6-r1.ebuild b/sys-apps/pciutils/pciutils-2.2.6-r1.ebuild
index 6eee4b3af765..b7b2552d8908 100644
--- a/sys-apps/pciutils/pciutils-2.2.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-2.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.6-r1.ebuild,v 1.1 2007/07/06 05:09:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.6-r1.ebuild,v 1.2 2007/07/06 09:56:12 uberlord Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -22,6 +22,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/pcimodules-${PN}-2.2.6.patch
 	epatch "${FILESDIR}"/${PN}-2.2.6-link.patch #160421
 	epatch "${FILESDIR}"/${PN}-2.2.4-update-pciids.patch
+	epatch "${FILESDIR}"/${PN}-2.2.6-alloca.patch
 	sed -i "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
 }