summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2013-02-25 20:25:33 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2013-02-25 20:25:33 +0000
commit1e42aaa6ced0055ed4dc8912054863a25ddcc2e3 (patch)
tree9f6e60b4ede6a721bb27deb9bf95fe4623b1a977 /sys-devel
parentRevision bump: EAPI 5, fix target dependencies in Makefile patch, respect CFL... (diff)
downloadgentoo-2-1e42aaa6ced0055ed4dc8912054863a25ddcc2e3.tar.gz
gentoo-2-1e42aaa6ced0055ed4dc8912054863a25ddcc2e3.tar.bz2
gentoo-2-1e42aaa6ced0055ed4dc8912054863a25ddcc2e3.zip
Apply upstream patch to fix parallel installation. Bug #450398
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/ct-ng/ChangeLog6
-rw-r--r--sys-devel/ct-ng/ct-ng-1.18.0.ebuild5
-rw-r--r--sys-devel/ct-ng/files/ct-ng-1.18.0-parallel-fix.patch36
3 files changed, 45 insertions, 2 deletions
diff --git a/sys-devel/ct-ng/ChangeLog b/sys-devel/ct-ng/ChangeLog
index 4a862ef70cc6..120566d0b38f 100644
--- a/sys-devel/ct-ng/ChangeLog
+++ b/sys-devel/ct-ng/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/ct-ng
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/ct-ng/ChangeLog,v 1.44 2013/02/23 16:07:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ct-ng/ChangeLog,v 1.45 2013/02/25 20:25:33 hwoarang Exp $
+
+ 25 Feb 2013; Markos Chandras <hwoarang@gentoo.org>
+ +files/ct-ng-1.18.0-parallel-fix.patch, ct-ng-1.18.0.ebuild:
+ Apply upstream patch to fix parallel installation. Bug #450398
23 Feb 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
Add myself as secondary maintainer
diff --git a/sys-devel/ct-ng/ct-ng-1.18.0.ebuild b/sys-devel/ct-ng/ct-ng-1.18.0.ebuild
index 170bb26d6266..97807c70e935 100644
--- a/sys-devel/ct-ng/ct-ng-1.18.0.ebuild
+++ b/sys-devel/ct-ng/ct-ng-1.18.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/ct-ng/ct-ng-1.18.0.ebuild,v 1.1 2013/02/01 23:16:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ct-ng/ct-ng-1.18.0.ebuild,v 1.2 2013/02/25 20:25:33 hwoarang Exp $
EAPI="4"
@@ -25,6 +25,9 @@ RDEPEND="net-misc/curl
src_prepare() {
epatch "${FILESDIR}"/${PN}-kconfig-respect-flags.patch
+ # bug 450398. Fixed upstream. Remove it on the next version bump
+ epatch "${FILESDIR}"/${P}-parallel-fix.patch
+
#Upstream provides ${S}/bootstrap which runs autoconf -Wall --force
#We'll use eautoconf to be portage friendly
eautoconf -Wall --force
diff --git a/sys-devel/ct-ng/files/ct-ng-1.18.0-parallel-fix.patch b/sys-devel/ct-ng/files/ct-ng-1.18.0-parallel-fix.patch
new file mode 100644
index 000000000000..07dc76901d51
--- /dev/null
+++ b/sys-devel/ct-ng/files/ct-ng-1.18.0-parallel-fix.patch
@@ -0,0 +1,36 @@
+
+# HG changeset patch
+# User "Yann E. MORIN" <yann.morin.1998@free.fr>
+# Date 1361823571 -3600
+# Node ID f89f8e6f876679184acb66ea642e42c9e7cf2f44
+# Parent 716e7d90cac28ecb8f16cc2806426921f9893422
+Makefile: fix parrallel (-j) installs
+
+Currently, we would remove previously installed patches before
+installing the new ones. Unfortunately, that does not play well
+with heavily parallel installs.
+
+Now, we consider it is the responsibility of the user to first
+uninstall any previous version before installing a new one.
+
+Reported-by: Markos Chandras <markos.chandras@gmail.com>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -r 716e7d90cac2 -r f89f8e6f8766 Makefile.in
+--- a/Makefile.in Tue Feb 19 13:07:09 2013 +0100
++++ b/Makefile.in Mon Feb 25 21:19:31 2013 +0100
+@@ -296,10 +296,9 @@
+
+ # If one is hacking crosstool-NG, the patch set might change between any two
+ # installations of the same VERSION, thus the patches must be removed prior
+-# to being installed. It is simpler to remove the whole lib/ directory, as it
+-# is the goal of the install-lib rule to install the lib/ directory...
+-install-lib: uninstall-lib \
+- $(DESTDIR)$(libdir) \
++# to being installed. It is the responsibility of the user to call uninstall
++# first, if (s)he deems it necessary
++install-lib: $(DESTDIR)$(libdir) \
+ install-lib-main \
+ install-lib-samples
+
+