summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-08-26 00:49:48 +0000
committerMike Frysinger <vapier@gentoo.org>2007-08-26 00:49:48 +0000
commita1da8cfeeefd6ba0858e6d8b037a354f66c76e43 (patch)
treecd9f72957ac1f824f0dc06fdb19157554da180c0 /dev-lang/erlang
parentlame use flag to mp3 (diff)
downloadgentoo-2-a1da8cfeeefd6ba0858e6d8b037a354f66c76e43.tar.gz
gentoo-2-a1da8cfeeefd6ba0858e6d8b037a354f66c76e43.tar.bz2
gentoo-2-a1da8cfeeefd6ba0858e6d8b037a354f66c76e43.zip
Make sure failures in subdirs are not ignored #184419.
(Portage version: 2.1.3.7)
Diffstat (limited to 'dev-lang/erlang')
-rw-r--r--dev-lang/erlang/ChangeLog6
-rw-r--r--dev-lang/erlang/erlang-11.2.5-r2.ebuild3
-rw-r--r--dev-lang/erlang/files/erlang-11.2.5-build.patch13
3 files changed, 20 insertions, 2 deletions
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index bdff4ff3a164..ce231f6d476d 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/erlang
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.73 2007/08/25 23:20:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.74 2007/08/26 00:49:48 vapier Exp $
+
+ 26 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/erlang-11.2.5-build.patch, erlang-11.2.5-r2.ebuild:
+ Make sure failures in subdirs are not ignored #184419.
25 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
erlang-11.2.5-r2.ebuild:
diff --git a/dev-lang/erlang/erlang-11.2.5-r2.ebuild b/dev-lang/erlang/erlang-11.2.5-r2.ebuild
index c3cbf998b0cb..d7e32f392ec9 100644
--- a/dev-lang/erlang/erlang-11.2.5-r2.ebuild
+++ b/dev-lang/erlang/erlang-11.2.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.5-r2.ebuild,v 1.2 2007/08/25 23:20:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.5-r2.ebuild,v 1.3 2007/08/26 00:49:48 vapier Exp $
inherit elisp-common eutils flag-o-matic multilib versionator
@@ -48,6 +48,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}"/${P}-build.patch #184419
# needed for amd64
epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch"
# needed for FreeBSD
diff --git a/dev-lang/erlang/files/erlang-11.2.5-build.patch b/dev-lang/erlang/files/erlang-11.2.5-build.patch
new file mode 100644
index 000000000000..3f68b32e78ba
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-11.2.5-build.patch
@@ -0,0 +1,13 @@
+make sure errors actually get passed back up
+
+--- make/otp_subdir.m
++++ make/otp_subdir.mk
+@@ -44,7 +44,7 @@
+ if test -f $$d/ignore_config_record.inf; then \
+ xflag=$$tflag ; \
+ fi ; \
+- (cd $$d && $(MAKE) $$xflag $@) ; \
++ (cd $$d && $(MAKE) $$xflag $@) || exit $$? ; \
+ fi ; \
+ fi ; \
+ done ; \