summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Griffis <agriffis@gentoo.org>2005-06-27 22:15:27 +0000
committerAron Griffis <agriffis@gentoo.org>2005-06-27 22:15:27 +0000
commit78f5ce46e4097c544a2b0adff3f6d715254ebb4f (patch)
treeff0a6fb6d80ce69d74cf7e1e0515f438a61b3821 /sys-libs/readline
parentVersion bumped to new version that finally fixes the deaded "No more processe... (diff)
downloadgentoo-2-78f5ce46e4097c544a2b0adff3f6d715254ebb4f.tar.gz
gentoo-2-78f5ce46e4097c544a2b0adff3f6d715254ebb4f.tar.bz2
gentoo-2-78f5ce46e4097c544a2b0adff3f6d715254ebb4f.zip
Fix parallel build
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-libs/readline')
-rw-r--r--sys-libs/readline/ChangeLog6
-rw-r--r--sys-libs/readline/files/readline-5.0-parallel.patch28
-rw-r--r--sys-libs/readline/readline-5.0-r2.ebuild5
3 files changed, 37 insertions, 2 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index b3ccc53d20c2..8ef5be04aebf 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/readline
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.47 2005/06/09 02:46:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.48 2005/06/27 22:15:27 agriffis Exp $
+
+ 27 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+ +files/readline-5.0-parallel.patch, readline-5.0-r2.ebuild:
+ Fix parallel build
09 Jun 2005; Mike Frysinger <vapier@gentoo.org> readline-5.0-r2.ebuild:
Stabilize for all arches.
diff --git a/sys-libs/readline/files/readline-5.0-parallel.patch b/sys-libs/readline/files/readline-5.0-parallel.patch
new file mode 100644
index 000000000000..eccb903f0f85
--- /dev/null
+++ b/sys-libs/readline/files/readline-5.0-parallel.patch
@@ -0,0 +1,28 @@
+--- readline-5.0/shlib/Makefile.in.old 2003-12-10 12:02:47 -0500
++++ readline-5.0/shlib/Makefile.in 2005-06-27 18:06:02 -0400
+@@ -145,7 +145,10 @@
+
+ all: $(SHLIB_STATUS)
+
+-supported: $(SHARED_LIBS)
++# Since the libs share some objects, make sure they're built separately
++# and not in parallel
++supported:
++ set -e; for x in $(SHARED_LIBS); do $(MAKE) $$x; done
+
+ unsupported:
+ @echo "Your system and compiler (${host_os}-${CC}) are not supported by the"
+--- readline-5.0/Makefile.in.old 2004-04-22 16:44:37 -0400
++++ readline-5.0/Makefile.in 2005-06-27 18:05:29 -0400
+@@ -145,7 +145,10 @@
+
+ everything: all examples
+
+-static: $(STATIC_LIBS)
++# Since the libs share some objects, make sure they're built separately
++# and not in parallel
++static:
++ set -e; for x in $(STATIC_LIBS); do $(MAKE) $$x; done
+
+ libreadline.a: $(OBJECTS)
+ $(RM) $@
diff --git a/sys-libs/readline/readline-5.0-r2.ebuild b/sys-libs/readline/readline-5.0-r2.ebuild
index 585400582a50..e23f10d19e6a 100644
--- a/sys-libs/readline/readline-5.0-r2.ebuild
+++ b/sys-libs/readline/readline-5.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.3 2005/06/09 02:46:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.4 2005/06/27 22:15:27 agriffis Exp $
inherit eutils gnuconfig
@@ -38,6 +38,9 @@ src_unpack() {
# force ncurses linking #71420
sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
+
+ # fix building in parallel
+ epatch ${FILESDIR}/readline-5.0-parallel.patch
}
src_compile() {