summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-20 18:45:06 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-20 18:45:06 +0000
commit771152d9021d578595f76210202ff41b7abd11fe (patch)
tree3da9b89a7696ec65ac014acf94b0089ebe23a6dd
parentalpha/sparc/x86 stable wrt #358513 (diff)
downloadhistorical-771152d9021d578595f76210202ff41b7abd11fe.tar.gz
historical-771152d9021d578595f76210202ff41b7abd11fe.tar.bz2
historical-771152d9021d578595f76210202ff41b7abd11fe.zip
Remove XZ_OPT="--memory=max" for app-arch/xz-utils wrt #342961 by Ben Kohler.
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/make.defaults5
2 files changed, 5 insertions, 5 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index cc56897a48c9..6e6f3fa87a85 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.228 2011/03/20 13:30:18 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.229 2011/03/20 18:45:06 ssuominen Exp $
+
+ 20 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> make.defaults:
+ Remove XZ_OPT="--memory=max" for app-arch/xz-utils wrt #342961 by Ben Kohler.
20 Mar 2011; Eray Aslan <eras@gentoo.org> virtuals:
remove old style virtual/mailx
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 59a0cc6a506f..c1d4401ceeb8 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.63 2011/03/01 01:14:59 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.64 2011/03/20 18:45:06 ssuominen Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
@@ -91,6 +91,3 @@ 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"