commit: c3e84cd89ea58fce3fc757e7f5718a2abb157c2f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 15:40:20 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 19 15:40:20 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c3e84cd8
targets: Build with FEATURES=binpkg-multi-instance
My cherry-pick of the fixed patch failed to handle the difference
between master and the catalyst-3.0-branch in that FEATURES is exported
multiple times.
Fixes: bfca870ed502 (targets: Build with FEATURES=binpkg-multi-instance)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/support/chroot-functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index 1dfd3277..c2fec616 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -132,7 +132,7 @@ setup_myfeatures(){
export PATH="/usr/lib/icecc/bin:${PATH}"
export PREROOTPATH="/usr/lib/icecc/bin"
fi
- export FEATURES="${clst_myfeatures} -news"
+ export FEATURES="${clst_myfeatures} -news binpkg-multi-instance"
}
setup_myemergeopts(){