diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2013-04-10 03:05:17 +0000 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2013-04-10 03:05:17 +0000 |
| commit | a6be5943a7442c414f148ee8691a5148b7d4e4ef (patch) | |
| tree | 0837712cda047305daaa6ff04c1879bc32d07645 /profiles | |
| parent | Disable debug symbols unless debug useflag is enabled (diff) | |
| download | gentoo-2-a6be5943a7442c414f148ee8691a5148b7d4e4ef.tar.gz gentoo-2-a6be5943a7442c414f148ee8691a5148b7d4e4ef.tar.bz2 gentoo-2-a6be5943a7442c414f148ee8691a5148b7d4e4ef.zip | |
fix for bug #465306, details in bugzie
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/base/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/base/make.defaults | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index fdf802ea599e..3c01a0608b0b 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.529 2013/04/06 13:20:01 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.530 2013/04/10 03:05:17 zerochaos Exp $ + + 09 Apr 2013; Rick Farina <zerochaos@gentoo.org> make.defaults: + Add expanded PYTHON_TARGETS to BOOTSTRAP_USE to prevent catalyst build failures. + These will need to be kept in sync to keep builds sane. Bug #465306 report by me, + verification by jmbsvicetto, all solutions by floppym 06 Apr 2013; Sven Vermeulen <swift@gentoo.org> package.mask: Drop python-selinux from this mask (moved to global mask for removal) diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index d19b201c5f53..b4b3e2029b6a 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -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/profiles/base/make.defaults,v 1.93 2013/03/23 10:23:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.94 2013/04/10 03:05:17 zerochaos Exp $ # # System-wide defaults for the Portage system # See portage(5) manpage @@ -122,7 +122,9 @@ PYTHONDONTWRITEBYTECODE="1" # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011) # Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE -BOOTSTRAP_USE="cxx unicode" +# Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}" +# This MUST be kept in sync with the PYTHON_TARGETS below +BOOTSTRAP_USE="cxx unicode python_targets_python3_2 python_targets_python2_7" # Mike Gilbert <floppym@gentoo.org> (15 May 2012) # Default target(s) for python-r1.eclass |