summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/make.defaults4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 3d2a33df9c36..8734f5da9249 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.678 2014/04/21 19:10:37 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.679 2014/04/22 01:22:06 vapier Exp $
+
+ 22 Apr 2014; Mike Frysinger <vapier@gentoo.org> make.defaults:
+ Build pkgconfig with USE=internal-glib in stage2 #507930.
21 Apr 2014; Rick Farina <zerochaos@gentoo.org> package.use.mask:
remove masks on metasploit[test,development] now that we have rake 10
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index eb459fd59357..ed766dc4934d 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.114 2014/04/09 07:10:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.115 2014/04/22 01:22:07 vapier Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
@@ -120,7 +120,7 @@ PYTHONDONTWRITEBYTECODE="1"
# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE
# 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_3 python_targets_python2_7"
+BOOTSTRAP_USE="cxx unicode internal-glib python_targets_python3_3 python_targets_python2_7"
# Mike Gilbert <floppym@gentoo.org> (15 May 2012)
# Default target(s) for python-r1.eclass