diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2013-03-14 14:31:04 +0000 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2013-03-14 14:31:04 +0000 |
| commit | a3ae6cee557db3bdea5f9cb15d89f1ad2b70e75d (patch) | |
| tree | 1864eb5482aa00a597f818b09a7f50323cc3e5e1 /dev-libs/klibc | |
| parent | Fix building on newer arches. (diff) | |
| download | gentoo-2-a3ae6cee557db3bdea5f9cb15d89f1ad2b70e75d.tar.gz gentoo-2-a3ae6cee557db3bdea5f9cb15d89f1ad2b70e75d.tar.bz2 gentoo-2-a3ae6cee557db3bdea5f9cb15d89f1ad2b70e75d.zip | |
Fix parallel make issue. Bug #461016
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key B576E4E3)
Diffstat (limited to 'dev-libs/klibc')
| -rw-r--r-- | dev-libs/klibc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch | 11 | ||||
| -rw-r--r-- | dev-libs/klibc/klibc-1.5.20.ebuild | 7 |
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog index ef273b259da2..81b80612728f 100644 --- a/dev-libs/klibc/ChangeLog +++ b/dev-libs/klibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/klibc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.86 2013/01/06 09:22:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.87 2013/03/14 14:31:04 mpagano Exp $ + + 14 Mar 2013; Michael Pagano <mpagano@gentoo.org> klibc-1.5.20.ebuild, + +files/klibc-1.5.20-parallel-make.patch: + Fix parallel make issue. Bug #461016 06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> klibc-1.5.25.ebuild: Add ~sparc, wrt bug #449220 diff --git a/dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch b/dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch new file mode 100644 index 000000000000..8afa2b6b5af6 --- /dev/null +++ b/dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch @@ -0,0 +1,11 @@ +--- scripts/Kbuild.install.orig 2013-03-14 09:33:32.429919267 -0400 ++++ scripts/Kbuild.install 2013-03-14 09:33:55.443820061 -0400 +@@ -95,7 +95,7 @@ header: + $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include + $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib + $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin +- $(Q)make -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install ++ $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install + $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. + $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 + $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) diff --git a/dev-libs/klibc/klibc-1.5.20.ebuild b/dev-libs/klibc/klibc-1.5.20.ebuild index 78aa6178bda6..489c2f599cb0 100644 --- a/dev-libs/klibc/klibc-1.5.20.ebuild +++ b/dev-libs/klibc/klibc-1.5.20.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.20.ebuild,v 1.7 2011/06/23 20:19:08 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.20.ebuild,v 1.8 2013/03/14 14:31:04 mpagano Exp $ # Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007: # This still needs major work. @@ -91,6 +91,9 @@ src_unpack() { # Fix usage of -s, bug #201006 epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch + # Fix parallel make install + epatch "${FILESDIR}"/${P}-parallel-make.patch + # Fix infinite loop during build with make 3.82 # http://www.zytor.com/pipermail/klibc/2010-November/002786.html epatch "${FILESDIR}"/${PN}-1.5.20-kbuild.patch |