summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2004-02-15 21:07:38 +0000
committerMartin Schlemmer <azarah@gentoo.org>2004-02-15 21:07:38 +0000
commit9d1cb1fa479f8ba2248954c0d7421cca2c8af89d (patch)
treee6adfdef5de9dff0d623bb1db80baf1ad3d678c7 /app-shells
parentMarked stable on ppc, security fix (Manifest recommit) (diff)
downloadgentoo-2-9d1cb1fa479f8ba2248954c0d7421cca2c8af89d.tar.gz
gentoo-2-9d1cb1fa479f8ba2248954c0d7421cca2c8af89d.tar.bz2
gentoo-2-9d1cb1fa479f8ba2248954c0d7421cca2c8af89d.zip
Fix parallel make, bug #41002.
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/bash/ChangeLog5
-rw-r--r--app-shells/bash/bash-2.05b-r9.ebuild6
-rw-r--r--app-shells/bash/files/bash-2.05b-parallel-build.patch11
3 files changed, 19 insertions, 3 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 540f533e1da2..c0d7a45a8138 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-shells/bash
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.30 2004/02/09 21:43:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.31 2004/02/15 21:07:38 azarah Exp $
+
+ 15 Feb 2004; Martin Schlemmer <azarah@gentoo.org> bash-2.05b-r9.ebuild:
+ Fix parallel make, bug #41002.
09 Feb 2004; <gustavoz@gentoo.org> bash-2.05b-r9.ebuild:
stable on sparc
diff --git a/app-shells/bash/bash-2.05b-r9.ebuild b/app-shells/bash/bash-2.05b-r9.ebuild
index 1043dc0f8aa8..e3ccc5c06c38 100644
--- a/app-shells/bash/bash-2.05b-r9.ebuild
+++ b/app-shells/bash/bash-2.05b-r9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r9.ebuild,v 1.5 2004/02/09 21:43:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r9.ebuild,v 1.6 2004/02/15 21:07:38 azarah Exp $
inherit eutils flag-o-matic gnuconfig
@@ -38,8 +38,10 @@ src_unpack() {
epatch ${FILESDIR}/${P}-multibyte-locale.patch
# Segfault on empty herestring
epatch ${FILESDIR}/${P}-empty-herestring.patch
- # fix broken rbash functionality
+ # Fix broken rbash functionality
epatch ${FILESDIR}/${P}-rbash.patch
+ # Fix parallel make, bug #41002.
+ epatch ${FILESDIR}/${P}-parallel-build.patch
# Enable SSH_SOURCE_BASHRC (#24762)
sed -e 's:^.*\(#define SSH_SOURCE_BASHRC\).*$:\1:' \
diff --git a/app-shells/bash/files/bash-2.05b-parallel-build.patch b/app-shells/bash/files/bash-2.05b-parallel-build.patch
new file mode 100644
index 000000000000..83f29cc739ec
--- /dev/null
+++ b/app-shells/bash/files/bash-2.05b-parallel-build.patch
@@ -0,0 +1,11 @@
+--- Makefile.in 2002-05-31 19:44:23.000000000 +0200
++++ Makefile.in-parallelbuild 2004-02-09 21:25:28.000000000 +0100
+@@ -604,7 +604,7 @@
+
+ config.h: stamp-h
+
+-stamp-h: config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
++stamp-h: version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
+ CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
+
+ config.status: $(srcdir)/configure