dev-util/kbuild: Fix for gcc-4.7, #419705; thanks Brennan Shacklett for the patch

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 85 insertions, 9 deletions

diff --git a/dev-util/kbuild/ChangeLog b/dev-util/kbuild/ChangeLog
index 7a3934ed9fe4..9b4e6ee71a3a 100644
--- a/dev-util/kbuild/ChangeLog
+++ b/dev-util/kbuild/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kbuild
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.28 2012/06/05 07:05:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.29 2012/06/20 20:04:41 jlec Exp $
+
+*kbuild-0.1.9998_pre20110817-r1 (20 Jun 2012)
+
+  20 Jun 2012; Justin Lecher <jlec@gentoo.org>
+  +kbuild-0.1.9998_pre20110817-r1.ebuild,
+  +files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch, metadata.xml:
+  Fix for gcc-4.7, #419705; thanks Brennan Shacklett for the patch
 
   05 Jun 2012; Lars Wendler <polynomial-c@gentoo.org> -kbuild-0.1.5-r1.ebuild,
   -kbuild-0.1.5_p2.ebuild, -kbuild-0.1.5_p2-r1.ebuild:
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
new file mode 100644
index 000000000000..435b3f57fbd2
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff -urN kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
+--- kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c	2011-08-17 14:28:42.000000000 -0700
++++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c	2012-06-16 13:55:05.341176965 -0700
+@@ -781,7 +781,7 @@
+ }
+ 
+ static unsigned char
+-internal_function __attribute ((pure))
++internal_function
+ re_string_fetch_byte_case (re_string_t *pstr)
+ {
+   if (BE (!pstr->mbs_allocated, 1))
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20110817-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20110817-r1.ebuild
new file mode 100644
index 000000000000..a861a8eefdce
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20110817-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.9998_pre20110817-r1.ebuild,v 1.1 2012/06/20 20:04:41 jlec Exp $
+
+EAPI=2
+
+WANT_AUTOMAKE=1.9
+
+inherit eutils autotools
+
+MY_P=kBuild-${PV/_/-}-src
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/flex
+	sys-devel/gettext
+	virtual/yacc"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/-src}
+
+src_prepare() {
+	rm -rf "${S}/kBuild/bin"
+
+	epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch" \
+		"${FILESDIR}/${PN}-glibc-2.10.patch" \
+		"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" \
+		"${FILESDIR}/${PN}-0.1.5_p2-qa.patch" \
+		"${FILESDIR}/${P}-kash-link-pthread.patch" \
+		"${FILESDIR}/${P}-gold.patch" \
+		"${FILESDIR}/${P}-gcc-4.7.patch"
+
+	cd "${S}/src/kmk"
+	eautoreconf
+	cd "${S}/src/sed"
+	eautoreconf
+
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i "${S}"/Config.kmk || die #332225
+}
+
+src_compile() {
+	kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
+}
diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
index 0ea40c2ad180..29941e2f84b5 100644
--- a/dev-util/kbuild/metadata.xml
+++ b/dev-util/kbuild/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>swapon@gmail.com</email>
-  <name>Alessio Cassibba</name>
-</maintainer>
-<maintainer>
-  <email>polynomial-c@gentoo.org</email>
-  <name>Lars Wendler</name>
-</maintainer>
+	<maintainer>
+		<email>swapon@gmail.com</email>
+		<name>Alessio Cassibba</name>
+	</maintainer>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>