diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-06-04 13:12:20 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-06-04 13:12:20 +0000 |
| commit | 4a8264d92647e028c75371933f89c0906897fde1 (patch) | |
| tree | a7ff78dd218aed57c6b8fac1c25746616fe4da5d /dev-util/kbuild | |
| parent | Add missing libXinerama dependency, bug #419613. (diff) | |
| download | gentoo-2-4a8264d92647e028c75371933f89c0906897fde1.tar.gz gentoo-2-4a8264d92647e028c75371933f89c0906897fde1.tar.bz2 gentoo-2-4a8264d92647e028c75371933f89c0906897fde1.zip | |
Fix for underlinking (missing pthread) detected by gold, #367607
(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/kbuild')
| -rw-r--r-- | dev-util/kbuild/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch | 16 | ||||
| -rw-r--r-- | dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild | 5 |
3 files changed, 25 insertions, 3 deletions
diff --git a/dev-util/kbuild/ChangeLog b/dev-util/kbuild/ChangeLog index 72f8037ee4a7..54560c50d91a 100644 --- a/dev-util/kbuild/ChangeLog +++ b/dev-util/kbuild/ChangeLog @@ -1,6 +1,11 @@ # 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.26 2012/04/18 20:17:12 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.27 2012/06/04 13:12:20 jlec Exp $ + + 04 Jun 2012; Justin Lecher <jlec@gentoo.org> + kbuild-0.1.9998_pre20110817.ebuild, + +files/kbuild-0.1.9998_pre20110817-gold.patch: + Fix for underlinking (missing pthread) detected by gold, #367607 18 Apr 2012; Lars Wendler <polynomial-c@gentoo.org> kbuild-0.1.9998_pre20110817.ebuild: diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch new file mode 100644 index 000000000000..8ad2ab3269cf --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch @@ -0,0 +1,16 @@ + src/kmk/Makefile.kmk | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk +index fe2cd43..135431e 100644 +--- a/src/kmk/Makefile.kmk ++++ b/src/kmk/Makefile.kmk +@@ -59,7 +59,7 @@ TEMPLATE_BIN-KMK_INCS.dragonfly = glob + TEMPLATE_BIN-KMK_INCS.freebsd = glob + TEMPLATE_BIN-KMK_INCS.openbsd = glob + TEMPLATE_BIN-KMK_INCS.solaris = glob +-TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) ++TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread + ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only. + ifeq ($(KBUILD_TARGET),win) + TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1 diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild index 0bb52728fcaa..9411c5fe18fe 100644 --- a/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild +++ b/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.5 2012/04/18 20:17:12 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.9998_pre20110817.ebuild,v 1.6 2012/06/04 13:12:20 jlec Exp $ EAPI=2 @@ -33,7 +33,8 @@ src_prepare() { "${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}-kash-link-pthread.patch" \ + "${FILESDIR}/${P}-gold.patch" cd "${S}/src/kmk" eautoreconf |