summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-06-05 18:56:38 +0000
committerMike Frysinger <vapier@gentoo.org>2010-06-05 18:56:38 +0000
commitb753b8ed187bc97fb910d23c5a429004daca33fa (patch)
tree0324ed9d983367ef9177ddda7ca95940f91cbd9e /profiles
parentInitial commit wrt #146363 by René Neumann. (diff)
downloadhistorical-b753b8ed187bc97fb910d23c5a429004daca33fa.tar.gz
historical-b753b8ed187bc97fb910d23c5a429004daca33fa.tar.bz2
historical-b753b8ed187bc97fb910d23c5a429004daca33fa.zip
Let XZ use all memory when unpacking to avoid failure with low-mem #303975.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog6
-rw-r--r--profiles/base/make.defaults5
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 7f7a9223ef33..59af0facd662 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.146 2010/06/05 15:36:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.147 2010/06/05 18:56:38 vapier Exp $
+
+ 05 Jun 2010; Mike Frysinger <vapier@gentoo.org> make.defaults:
+ Let XZ use all memory when unpacking to avoid failure with low-mem
+ #303975.
05 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> package.use.mask:
Unmask USE bluetooth for app-pda/pilot-link wrt #249889 by Jesse Adelman.
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 848d8e39d997..9473b21de30e 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.51 2010/04/29 09:23:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.52 2010/06/05 18:56:38 vapier Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
@@ -75,3 +75,6 @@ USE="${USE} cxx"
# We usually don't want python to (re)write .py[co] files during phase runs
# since it could cause sandbox violations
PYTHONDONTWRITEBYTECODE="1"
+
+# Let XZ use all memory when unpacking to avoid failure with low-mem #303975
+XZ_OPT="--memory=max"