Let XZ use all memory when unpacking to avoid failure with low-mem #303975.

diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 7f7a9223ef330887df5e07313cf29b5aaf457b7d..59af0facd662e9631f1bbf5b45c94d00c4048415 100644 (file)
--- 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 848d8e39d99744710ef9376c1993bd4cdbead233..9473b21de30e433bb48ef2c85c08967f875d00d4 100644 (file)
--- 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"