Respect LDFLAGS

Package-Manager: portage-2.2.0_alpha17/cvs/Linux x86_64

4 files changed, 89 insertions, 3 deletions

diff --git a/dev-util/kbuild/ChangeLog b/dev-util/kbuild/ChangeLog
index e4f37acea3d5..f526044cc8bd 100644
--- a/dev-util/kbuild/ChangeLog
+++ b/dev-util/kbuild/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kbuild
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.16 2010/06/22 18:40:19 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.17 2011/01/19 15:02:00 polynomial-c Exp $
+
+*kbuild-0.1.5_p2-r1 (19 Jan 2011)
+
+  19 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +kbuild-0.1.5_p2-r1.ebuild, +files/kbuild-0.1.5_p2-qa.patch:
+  Added patch to respect LDLFAGS. Thanks to Kacper Kowalik who provided a fix
+  in bug #332225.
 
   22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   kbuild-0.1.5-r1.ebuild:
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 8e74dc5171e2..0384fce3c4c4 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,10 +1,12 @@
 AUX kbuild-0.1.5-gentoo-docdir.patch 354 RMD160 882f0bf45ab570f0bda4f86fe91b416cdba8713e SHA1 00104d51bf8b8900cae78f85eaaff9f792e165c2 SHA256 cc0d7e6915fae7b9230042549552ca0c9b59da4550a4cc601520a11509352ed0
+AUX kbuild-0.1.5_p2-qa.patch 593 RMD160 73d272b2a7c4b462a4c4085ac1ff6eed0b180c88 SHA1 54fa7db52f0467e8405924ef8affc1f633f8665a SHA256 31f68240c5c6ea902234f028c5dd7ac9dbaf52165eb4193807fa791fd6ff0672
 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.5-p2-src.tar.gz 2433567 RMD160 58755ef4e53d0eb918055c7a0b0d80f9761195cf SHA1 4cd59e949f7306e0dfb5ac4a6d440adfcdfd6ce2 SHA256 8205db5e74d27ef6394bd48118a310e4f5caab455575f0ea975f62dcb8d642a6
 DIST kBuild-0.1.5-src-20090221.tar.bz2 21943772 RMD160 f174022edcb9dfd980ab90d036b649ca05460918 SHA1 b01571914a32d408c604d00aa75d0c6a10e45877 SHA256 8e0b95d6d7971e584ac4f1ddc2212940f7ccfd6a5bccc5bb9bf5853ed84bf592
 EBUILD kbuild-0.1.5-r1.ebuild 1141 RMD160 e771b8550e125df4d8460232cb4a7c1c5b4be6ba SHA1 cf65e580bb13719aae036cea52b2b84579c39668 SHA256 612a708eb22c1893cbb4c354823bc4f9c32f10bb63d30278c2684fd1e2becad1
+EBUILD kbuild-0.1.5_p2-r1.ebuild 1229 RMD160 b59adf7cea7626d1e4953748d476c5317f004f55 SHA1 0210a6c4caa0926da4a5d7c74350323484b32eed SHA256 f9fe009af1074b14146aaf25334adbc0156b305409884ad4e88616ac216b18fc
 EBUILD kbuild-0.1.5_p2.ebuild 1100 RMD160 d4c32754b4d7af43eb3b8c2c03a513b4f822d316 SHA1 5724dd5ba2dd44c1a689bbfed4551f30b99310f5 SHA256 fd1151dcfbcb388717d264522ff7d557a386e3fc2461f1690fcc78be78ab9392
 EBUILD kbuild-9999.ebuild 929 RMD160 f40c010a0f16f96f1e573e1ae6e934f7c2eb1618 SHA1 dc32faf6d5c9afb0b10109df027c16ac65956571 SHA256 84ae3ec8fb9c7a9d2d7697808fd2e57b27e5b377569f8c55c0ec8bf5c5382a3f
-MISC ChangeLog 3586 RMD160 a86cbc692129e2a471296a03e346421b9f40b683 SHA1 eda9a870b37e947cc6367c6be2c88b5f6a77c78f SHA256 cab84d8dc7b6ac46501e6a641b7e44881f1e147d84a8c925883533212d3c15c9
+MISC ChangeLog 3839 RMD160 49b2df90813cee52610b6388e2040284586e5b33 SHA1 450826c6adcf7dba9a8edcad3526a4deb744eff7 SHA256 0d3d375161c4b5523c172c9dadc8ec5b01ca9f970c9111058409457102099337
 MISC metadata.xml 440 RMD160 e17df324a907dc57e613009dc2c5ac9c24c2c8c7 SHA1 8848e0d9d23b9f40348f1fa46978ca231a524e7c SHA256 61e0bc766b9c9e813c3ab1868c23e73cd35fe38de6922dedf22aa5018a9791d8
diff --git a/dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch b/dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch
new file mode 100644
index 000000000000..706c3a7fd538
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch
@@ -0,0 +1,26 @@
+* warning: implicit declaration of function ‘unlink’
+* warning: too few arguments for format
+--- a/src/sed/lib/utils.c
++++ b/src/sed/lib/utils.c
+@@ -35,6 +35,10 @@
+ # include <stdlib.h>
+ #endif /* HAVE_STDLIB_H */
+ 
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif /* HAVE_UNISTD_H */
++
+ #include "utils.h"
+ 
+ const char *myname;
+--- a/src/kmk/kmkbuiltin/printf.c
++++ b/src/kmk/kmkbuiltin/printf.c
+@@ -206,7 +206,7 @@
+ 
+ 	(void)funcname;
+ 	if (rc != 0)
+-		fatal (NILF, _("$(%s): failure rc=%d\n"), rc);
++		fatal (NILF, _("$(%s): failure rc=%d\n"), funcname, rc);
+ 	return o;
+ }
+ #endif
diff --git a/dev-util/kbuild/kbuild-0.1.5_p2-r1.ebuild b/dev-util/kbuild/kbuild-0.1.5_p2-r1.ebuild
new file mode 100644
index 000000000000..053883b23be3
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.5_p2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 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_p2-r1.ebuild,v 1.1 2011/01/19 15:02:00 polynomial-c 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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/gettext"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/-src}
+
+src_prepare() {
+	rm -rf "${S}/kBuild/bin"
+
+	epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch"
+	epatch "${FILESDIR}/${PN}-glibc-2.10.patch"
+	epatch "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+	epatch "${FILESDIR}/${P}-qa.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"
+}