From: Matt Turner <mattst88@gentoo.org>
Date: Mon, 30 Mar 2020 01:15:25 +0000 (-0700)
Subject: scripts/bootstrap.sh: Allow CONFIG_PROTECT
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0aa49828ae253a22a3327f4024fcada801e64245;p=gentoo.git

scripts/bootstrap.sh: Allow CONFIG_PROTECT

With a CONFIG_PROTECT="-*" setting, glibc will overwrite the system's
/etc/locale.gen file in src_install() with its default-empty one. In
pkg_postinst() it reads the empty /etc/locale.gen it just installed, and
as a result generates all locales.

So, allow CONFIG_PROTECT to be passed through unmolested so long as it
starts with "-*". This allows locales to be selectively enabled when
bootstrap.sh is run with CONFIG_PROTECT="-* /etc/locale.gen".

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index aa31fb15e8bd..c06e25dba133 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -306,7 +306,7 @@ echo ---------------------------------------------------------------------------
 [[ -x /usr/bin/gcc-config  ]] && GCC_CONFIG="/usr/bin/gcc-config"
 
 # Allow portage to overwrite stuff
-export CONFIG_PROTECT="-*"
+[[ $CONFIG_PROTECT != "-*"* ]] && export CONFIG_PROTECT="-*"
 
 # disable collision-protection
 export FEATURES="${FEATURES} -collision-protect"