Patch so kbuild compiles against glibc-2.10 (Bug #270607)

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 43 insertions, 4 deletions

diff --git a/dev-util/kbuild/ChangeLog b/dev-util/kbuild/ChangeLog
index 1f1b32fbdac7..110b3009ac8e 100644
--- a/dev-util/kbuild/ChangeLog
+++ b/dev-util/kbuild/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kbuild
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.9 2009/04/24 07:59:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.10 2009/06/08 13:14:21 lack Exp $
+
+  08 Jun 2009; Jim Ramsay <lack@gentoo.org> kbuild-0.1.5-r1.ebuild,
+  +files/kbuild-glibc-2.10.patch:
+  Patch so kbuild compiles against glibc-2.10 (Bug #270607)
 
   24 Apr 2009; Patrick Lauer <patrick@gentoo.org> kbuild-0.1.5-r1:
   Adding subversion to depends, fixes #266741
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index df7705e881ee..86475a4a0e6f 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,4 +1,5 @@
 AUX kbuild-fix-acl-include.patch 575 RMD160 a2b5b23f94c7d23be95324b46237c8f83e12cfe6 SHA1 e17b6befeea6384d8a7d836fb07f571a4c1d8f6c SHA256 3f9bbdf5b16a9c0e22413d3ab068b586962bab8adbb370071ab82c444143e01e
+AUX kbuild-glibc-2.10.patch 1060 RMD160 98b443cdc2a104e4b72164cb56afc2747a4013f0 SHA1 f308ca7f94d2860afc367de6705cdc5f8e370eae SHA256 af376f236e287acec5fe383e26c6d614758b0ba6f0c569fb6dcd2b4b36d17ec1
 AUX kbuild-unknown-configure-opt.patch 500 RMD160 9bbc47e064010898a4084c42893c17feefd0b961 SHA1 3dcd540d1863346306e04bc9ce26430c8705dee9 SHA256 ccbac9ef80cd50668c9dd65a7e1ade5f86f3ca2def614e2d1cc5b3e2045f97b1
 DIST kBuild-0.1.3-src.tar.gz 10070233 RMD160 c550952feb8173e2ea8e066b0e95c9d94caa9224 SHA1 482a6c13d8aeb55dc23f4bc610bb415c91b3c183 SHA256 79d085b395b87fdf06d24bbf4e03801b5c35d61c7f41d5b0df6fa0b275b6b1b1
 DIST kBuild-0.1.4-src.tar.gz 2293916 RMD160 067a69e5f2877a6734bccfc2fcc9754eab9dbc1c SHA1 49f2cb097867c2c057013c8e9868ae7bd04826d0 SHA256 fe17d9e7603206c4ee4f93ab328f3fd79863928c933bbc42d2f5cf3c789c4c68
@@ -6,8 +7,8 @@ DIST kBuild-0.1.5-src-20090221.tar.bz2 21943772 RMD160 f174022edcb9dfd980ab90d03
 DIST kBuild-0.1.5-src.tar.gz 2431964 RMD160 9a6ad3344c0440a6fa8ab0e1acee41b9503ef2b7 SHA1 c9c3a8ec252a3f415b75450bfb5ddc00f23d3c01 SHA256 db3b672da8f579949e4d8c41d023d6d1ca1ab5626a2e552970ba75e7a3af84b5
 EBUILD kbuild-0.1.3.ebuild 985 RMD160 a9e3f737f09e47993e0df5eedf2ac8b5db956af1 SHA1 e04f0f7b6eca38faea47b03a6a376699b20f85ca SHA256 2a83ed897aef878ba7d7e2ede56c7228aa6e04c763b9026da2f063e814ade3be
 EBUILD kbuild-0.1.4.ebuild 1009 RMD160 4983bda20d86fc7a1b119f036d77232afcf88902 SHA1 f1b8d12487805a8e9416e808d32d17e9dcb644ae SHA256 83505185456ce5bb0f55d84ae9c7534e88c79d64be6e44d370152d40ccac71e2
-EBUILD kbuild-0.1.5-r1.ebuild 1076 RMD160 ecd31c692e08173b4608ad3eca2cfdc677a80c2b SHA1 65f9ccb60c54b58f16f8c70b09da364d23c92e12 SHA256 657d56faf86addc21c6e3de9e688b97c0f2708c44de16303b5c5cc79937109bd
+EBUILD kbuild-0.1.5-r1.ebuild 1119 RMD160 72e9d64f4c726f1960afd39093e7b0c03cb8d97b SHA1 fe360e2caaa91bfa122904f5edd2a10e30fa03db SHA256 e74165e2bc28a5da9df183150b1d7e102f5c17a25f29b042c49167a744d5506f
 EBUILD kbuild-0.1.5.ebuild 1033 RMD160 afa9c1a7bd14c99e8d4343ad3a421711cdbd9cf6 SHA1 7fca5390374b92124e45a84cd1d7322bf12e78a3 SHA256 f924455f90087e75c1d9c1e2ba20129cff5e71ce4091fac95982e233a443b21f
 EBUILD kbuild-9999.ebuild 929 RMD160 f40c010a0f16f96f1e573e1ae6e934f7c2eb1618 SHA1 dc32faf6d5c9afb0b10109df027c16ac65956571 SHA256 84ae3ec8fb9c7a9d2d7697808fd2e57b27e5b377569f8c55c0ec8bf5c5382a3f
-MISC ChangeLog 2268 RMD160 53796259de64c684e904b64c6fb42326fab3b4dd SHA1 b427c0ab745aa07c0141980a1c1e7cd9e363ed62 SHA256 0400c595a92999b146d24c150c1e94569efd1ec0f35ed575a546afdc93cbf9b6
+MISC ChangeLog 2429 RMD160 c7a33481ddd71aa92bd5389f6600ff95e905ea8c SHA1 0566de987395d3c0b679f6df552052649aa839cf SHA256 ba71f9309e892ca41c8721f5ec67bbe2f72acd886414406b1e4e82671282b48a
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
new file mode 100644
index 000000000000..a1d17d7d6497
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
@@ -0,0 +1,33 @@
+diff -ruN kBuild-0.1.5-orig/src/ash/output.c kBuild-0.1.5/src/ash/output.c
+--- kBuild-0.1.5-orig/src/ash/output.c	2009-04-08 18:21:26.000000000 -0400
++++ kBuild-0.1.5/src/ash/output.c	2009-05-22 20:11:49.000000000 -0400
+@@ -230,6 +230,7 @@
+ 	va_end(ap);
+ }
+ 
++#if 0
+ void
+ dprintf(const char *fmt, ...)
+ {
+@@ -240,6 +241,7 @@
+ 	va_end(ap);
+ 	flushout(out2);
+ }
++#endif
+ 
+ void
+ fmtstr(char *outbuf, size_t length, const char *fmt, ...)
+diff -ruN kBuild-0.1.5-orig/src/ash/output.h kBuild-0.1.5/src/ash/output.h
+--- kBuild-0.1.5-orig/src/ash/output.h	2009-04-08 18:21:26.000000000 -0400
++++ kBuild-0.1.5/src/ash/output.h	2009-05-22 20:12:28.000000000 -0400
+@@ -65,8 +65,10 @@
+     __attribute__((__format__(__printf__,2,3)));
+ void out1fmt(const char *, ...)
+     __attribute__((__format__(__printf__,1,2)));
++#if 0
+ void dprintf(const char *, ...)
+     __attribute__((__format__(__printf__,1,2)));
++#endif
+ void fmtstr(char *, size_t, const char *, ...)
+     __attribute__((__format__(__printf__,3,4)));
+ void doformat(struct output *, const char *, va_list);
diff --git a/dev-util/kbuild/kbuild-0.1.5-r1.ebuild b/dev-util/kbuild/kbuild-0.1.5-r1.ebuild
index c2252d1f0121..a29ba3a956cc 100644
--- a/dev-util/kbuild/kbuild-0.1.5-r1.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.5-r1.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/dev-util/kbuild/kbuild-0.1.5-r1.ebuild,v 1.2 2009/04/24 07:59:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.5-r1.ebuild,v 1.3 2009/06/08 13:14:21 lack Exp $
 
 EAPI=2
 
@@ -34,6 +34,7 @@ src_prepare() {
 		eautoreconf
 		cd "${S}"
 		epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch"
+		epatch "${FILESDIR}/${PN}-glibc-2.10.patch"
 }
 
 src_compile() {