[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     405d661f15dd4f47a4bb3659d2904f28ed72eb56
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 11:27:13 2015 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 11:27:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=405d661f

bootstrap-prefix: prepare for OS X El Capitan

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a6ddae7..7b62259 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -232,7 +232,7 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
-		x86_64-apple-darwin9|x86_64-apple-darwin1[01234])
+		x86_64-apple-darwin9|x86_64-apple-darwin1[012345])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
@@ -1677,7 +1677,7 @@ EOF
 	local candomultilib=no
 	local t64 t32
 	case "${CHOST}" in
-		*86*-darwin9|*86*-darwin1[01234])
+		*86*-darwin9|*86*-darwin1[012345])
 			# PPC/Darwin only works in 32-bits mode, so this is Intel
 			# only, and only starting from Leopard (10.5, darwin9)
 			candomultilib=yes

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b033ba559278a56771f02d010d94d7c244abcd18
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 19:35:26 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 19:35:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b033ba55

scripts/bootstrap-prefix.sh: use chost-clang CC/CXX on Darwin

 scripts/bootstrap-prefix.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 61d27fe..2c96321 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1142,10 +1142,10 @@ bootstrap_stage2() {
 		{
 			echo
 			echo "# System compiler on Darwin Prefix is Clang, do not remove this"
-			echo "CC=clang"
-			echo "CXX=clang++"
-			echo "BUILD_CC=clang"
-			echo "BUILD_CXX=clang++"
+			echo "CC=${CHOST}-clang"
+			echo "CXX=${CHOST}-clang++"
+			echo "BUILD_CC=${CHOST}-clang"
+			echo "BUILD_CXX=${CHOST}-clang++"
 		} >> "${ROOT}"/etc/portage/make.conf
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     bbb2f3fa6dce6655350b53ca70021c842ccea6ad
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 19:34:38 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 19:34:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bbb2f3fa

scripts/bootstrap-prefix.sh: add identification on make.conf

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7b62259..61d27fe 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -195,6 +195,7 @@ bootstrap_setup() {
 	
 	if [[ ! -f ${ROOT}/etc/portage/make.conf ]] ; then
 		{
+			echo "# Added by bootstrap-prefix.sh for ${CHOST}"
 			echo 'USE="unicode nls"'
 			echo 'CFLAGS="${CFLAGS} -O2 -pipe"'
 			echo 'CXXFLAGS="${CFLAGS}"'

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3c42a8de35280c8e2d88cedd70f11c03c613d464
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 08:15:47 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 08:15:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3c42a8de

scripts/bootstrap-prefix.sh: bump tree for bugs #572510 and #564814

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2c96321..0186a26 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -382,7 +382,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20150617"
+	local PV="20160121"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a21e6ad88eb9f1d7dba223dc91011305aa8aa5fa
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 16:14:33 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 16:14:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a21e6ad8

scripts/bootstrap-prefix.sh: add tweaks for clang-based bootstrap on OSX

 scripts/bootstrap-prefix.sh | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0186a26..a944a0e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1132,10 +1132,6 @@ bootstrap_stage2() {
 	# undo gmp cxx hack
 	rm -f "${ROOT}"/tmp/etc/portage/package.use
 	
-	# make sure the EPREFIX gcc shared libraries are there
-	mkdir -p "${ROOT}"/usr/${CHOST}/lib/gcc
-	cp "${ROOT}"/tmp/usr/${CHOST}/lib/gcc/* "${ROOT}"/usr/${CHOST}/lib/gcc
-
 	if [[ ${CHOST} == *darwin* ]] ; then
 		# we use Clang as our toolchain compiler, so we need to make
 		# sure we actually use it
@@ -1147,6 +1143,14 @@ bootstrap_stage2() {
 			echo "BUILD_CC=${CHOST}-clang"
 			echo "BUILD_CXX=${CHOST}-clang++"
 		} >> "${ROOT}"/etc/portage/make.conf
+		# llvm-3.4 isn't setup to provide the CHOST symlinks, so we'll
+		# do it ourselves here to make the bootstrap continue
+		( cd "${ROOT}"/tmp/usr/bin && ln -s clang ${CHOST}-clang && ln -s clang++ ${CHOST}-clang++ )
+	else
+		# make sure the EPREFIX gcc shared libraries are there
+		mkdir -p "${ROOT}"/usr/${CHOST}/lib/gcc
+		cp "${ROOT}"/tmp/usr/${CHOST}/lib/gcc/* "${ROOT}"/usr/${CHOST}/lib/gcc
+
 	fi
 
 	einfo "stage2 successfully finished"
@@ -1163,9 +1167,16 @@ bootstrap_stage3() {
 		return 1
 	fi
 	
-	if ! type -P gcc > /dev/null ; then
-		eerror "gcc not found, did you bootstrap stage2?"
-		return 1
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		if ! type -P clang > /dev/null ; then
+			eerror "clang not found, did you bootstrap stage2?"
+			return 1
+		fi
+	else
+		if ! type -P gcc > /dev/null ; then
+			eerror "gcc not found, did you bootstrap stage2?"
+			return 1
+		fi
 	fi
 
 	configure_toolchain || return 1
@@ -1200,10 +1211,14 @@ bootstrap_stage3() {
 	)
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
-	# work around eselect-python not being there, and llvm insisting on
-	# using python
-	ac_cv_path_PYTHON="${ROOT}/tmp/usr/bin/python" \
+	# Clang unconditionally requires python, the eclasses are really not
+	# setup for a scenario where python doesn't live in the target
+	# prefix and no helpers are available
+	( cd "${ROOT}"/usr/bin && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
+	# in addition, avoid collisions
+	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
 	emerge_pkgs --nodeps ${compiler} || return 1
+	( cd "${ROOT}"/usr/bin && rm -f python2.7 )
 
 	# Use $ROOT tools where possible from now on.
 	rm -f "${ROOT}"/bin/sh

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b9f3ceea65508d28ad13a9c533ec4e560f5e71e1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 18:08:48 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 18:08:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b9f3ceea

scripts/bootstrap-prefix.sh: be more careful with python2.7 existence

 scripts/bootstrap-prefix.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a944a0e..56e08d1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1214,11 +1214,10 @@ bootstrap_stage3() {
 	# Clang unconditionally requires python, the eclasses are really not
 	# setup for a scenario where python doesn't live in the target
 	# prefix and no helpers are available
-	( cd "${ROOT}"/usr/bin && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
+	( cd "${ROOT}"/usr/bin && test ! -e python2.7 && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
 	emerge_pkgs --nodeps ${compiler} || return 1
-	( cd "${ROOT}"/usr/bin && rm -f python2.7 )
 
 	# Use $ROOT tools where possible from now on.
 	rm -f "${ROOT}"/bin/sh

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c428ee9301e6606f4522cc7cccdb542fe8d04ece
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 10:41:22 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 10:41:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c428ee93

scripts/bootstrap-prefix.sh: bump tree snapshot for latest fixes

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 56e08d1..117ff79 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -382,7 +382,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20160121"
+	local PV="20160122"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e0395c9f90b70fedbc4e832e999405d54a24e314
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 15:40:48 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 15:40:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e0395c9f

scripts/bootstrap-prefix: be more careful about creatng python symlink

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 117ff79..de47ee2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1214,7 +1214,7 @@ bootstrap_stage3() {
 	# Clang unconditionally requires python, the eclasses are really not
 	# setup for a scenario where python doesn't live in the target
 	# prefix and no helpers are available
-	( cd "${ROOT}"/usr/bin && test ! -e python2.7 && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
+	( cd "${ROOT}"/usr/bin && test ! -e python2.7 && test ! -e python && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
 	emerge_pkgs --nodeps ${compiler} || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     9747bcfdfc18c635608d848825b75bec7f05db67
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 19:12:11 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:12:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9747bcfd

scripts/bootstrap-prefix: cleanup temp python2.7 symlink to avoid collisions with the real python2.7

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index de47ee2..c47dd13 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1214,10 +1214,11 @@ bootstrap_stage3() {
 	# Clang unconditionally requires python, the eclasses are really not
 	# setup for a scenario where python doesn't live in the target
 	# prefix and no helpers are available
-	( cd "${ROOT}"/usr/bin && test ! -e python2.7 && test ! -e python && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
+	( cd "${ROOT}"/usr/bin && test ! -e python && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
 	emerge_pkgs --nodeps ${compiler} || return 1
+	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python2.7 )
 
 	# Use $ROOT tools where possible from now on.
 	rm -f "${ROOT}"/bin/sh

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5cd74dc54d79c9cda08d52097e238a69ac03ee43
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 19:21:46 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:21:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5cd74dc5

scripts/bootstrap-prefix: try to work around c_rehash missing openssl dep, bug #572790

 scripts/bootstrap-prefix.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c47dd13..924ce3e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1264,6 +1264,9 @@ bootstrap_stage3() {
 		emerge --sync || emerge-webrsync || return 1
 	fi
 
+	# temporarily work around c_rehash missing openssl dependency, bug #572790
+	emerge -1 openssl || return 1
+
 	# Portage should figure out itself what it needs to do, if anything
 	USE="-git" emerge -u system || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     bc4a43378c183fd9ff1ef98fa21f392fe3f65b94
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 13:06:31 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 13:06:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bc4a4337

scripts/bootstrap-prefix: bump bootstrap snapshot

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 924ce3e..7d186f1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -382,7 +382,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20160122"
+	local PV="20160124"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0da045d27b4da0fd04938e03e24407b56cfc33cc
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 19:41:40 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 19:41:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0da045d2

scripts/bootstrap-prefix: document why the versions of llvm are used

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7d186f1..40eaede 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -181,6 +181,8 @@ configure_toolchain() {
 			# libcxx, which only compiles with clang
 			local libcxx="sys-libs/libcxx-headers sys-libs/libcxxabi sys-libs/libcxx"
 			compiler_stage1+=" dev-libs/libffi <sys-devel/llvm-3.5 ${libcxx}"
+			# similar, the deps for 3.6+ are too high (cmake, ninja,
+			# python) so we have to do this with an intermediate
 			compiler="${libcxx} sys-libs/csu dev-libs/libffi <sys-devel/llvm-3.6 <sys-devel/clang-3.6"
 			;;
 		*-*-aix*)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     03e091d4c48537775f2b91b508a76b3b26818bd1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 19:43:09 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 19:43:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=03e091d4

bootstrap_stage3: ensure we use includes from target prefix

Because we use a compiler from stage2 (= EPREFIX/tmp) it also has its
searchpath setup to look in that prefix.  This gives problems when we
need libraries/includes from the newly built prefix (like with libiconv)
so, temporarily add flags for the target prefix.

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 40eaede..8315397 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1183,6 +1183,8 @@ bootstrap_stage3() {
 
 	configure_toolchain || return 1
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
+	export CPPFLAGS="-I${ROOT}/usr/include"
+	export LDFLAGS="-I${ROOT}/usr/lib"
 	unset CC CXX
 
 	emerge_pkgs() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4b9b293f2ff9928abe85a0cffd9626ab3149e9f9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 19:47:57 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 19:47:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4b9b293f

scripts/bootstrap-prefix: fix compilation of grep with bootstrap compiler

 scripts/bootstrap-prefix.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8315397..91473d2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1246,6 +1246,10 @@ bootstrap_stage3() {
 		virtual/os-headers
 		sys-apps/portage
 	)
+	# for grep we need to do a little workaround as we use llvm-3.4
+	# here, which doesn't necessarily grok the system headers on newer
+	# OSX, confusing the buildsystem
+	ac_cv_c_decl_report=warning \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	# Switch to the proper portage.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b59c5ee26f97ed7fc9d20c8ebca2e11c052dc31b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 09:16:39 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 09:16:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b59c5ee2

scripts/bootstrap-prefix.sh: bump bootstrap snapshot for bug #573852

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 91473d2..237d08a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -384,7 +384,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20160124"
+	local PV="20160204"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     71a52c7f248a3e3aac46751325c6c43509d55755
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 08:09:30 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 08:09:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=71a52c7f

scripts/bootstrap-prefix: bump snapshot

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 237d08a..915ee71 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -384,7 +384,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20160204"
+	local PV="20160209"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c46a8b5aa5af075cb0350e8a0a023b0de1c811a2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 08:25:49 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 08:25:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c46a8b5a

scripts/bootstrap-prefix.sh: be a bit more careful with CFLAGS during initial phases

 scripts/bootstrap-prefix.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 915ee71..d31a8ed 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1061,6 +1061,7 @@ do_emerge_pkgs() {
 		FEATURES="-news ${FEATURES}" \
 		PYTHONPATH="${ROOT}"/tmp/usr/lib/portage/pym \
 		USE="-berkdb -fortran -gdbm -git -libcxx -nls -pcre -ssl -python bootstrap clang internal-glib ${USE}" \
+		CFLAGS= CXXFLAGS= \
 		emerge -v --oneshot --root-deps ${opts} "${pkg}" || return 1
 	done
 }
@@ -1145,7 +1146,9 @@ bootstrap_stage2() {
 			echo "BUILD_CC=${CHOST}-clang"
 			echo "BUILD_CXX=${CHOST}-clang++"
 		} >> "${ROOT}"/etc/portage/make.conf
-		# llvm-3.4 isn't setup to provide the CHOST symlinks, so we'll
+		# llvm won't setup symlinks to CHOST-clang here because
+		# we're in a cross-ish situation (at least according to
+		# multilib.eclass -- can't blame it at this point really)
 		# do it ourselves here to make the bootstrap continue
 		( cd "${ROOT}"/tmp/usr/bin && ln -s clang ${CHOST}-clang && ln -s clang++ ${CHOST}-clang++ )
 	else
@@ -1273,10 +1276,10 @@ bootstrap_stage3() {
 	fi
 
 	# temporarily work around c_rehash missing openssl dependency, bug #572790
-	emerge -1 openssl || return 1
+	CFLAGS= CXXFLAGS= emerge -1 openssl || return 1
 
 	# Portage should figure out itself what it needs to do, if anything
-	USE="-git" emerge -u system || return 1
+	CFLAGS= CXXFLAGS= USE="-git" emerge -u system || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	emerge --depclean

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     11fae029c76d2d4df0533b86fa7b74f5ed99c3c7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 12:08:29 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 12:08:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=11fae029

scripts/bootstrap-prefix: bump snapshot

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d31a8ed..d6b53f1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -384,7 +384,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20160209"
+	local PV="20160211"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fdabbac2e9d9d4b6cda129c3640f192da35868e5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 09:55:43 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 09:55:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fdabbac2

scripts/bootstrap-prefix: try to hide java dialog on OSX

 scripts/bootstrap-prefix.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d6b53f1..e1e75fb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -981,6 +981,19 @@ bootstrap_stage1() { (
 			} > "${ROOT}"/tmp/usr/bin/nm
 			chmod 755 "${ROOT}"/tmp/usr/bin/nm
 			;;
+		*-darwin*)
+			# Recent Mac OS X have a nice popup to install java when
+			# it's called without being installed, this doesn't stop the
+			# process from going, but keeps popping up a dialog during
+			# the bootstrap process, which is slightly anoying.
+			# Nevertheless, we don't want Java when it's installed to be
+			# detected, so hide during the stage builds
+			{
+				echo "#!$(type -P false)"
+			} > "${ROOT}"/tmp/usr/bin/java
+			cp "${ROOT}"/tmp/usr/bin/java{,c}
+			chmod 755 "${ROOT}"/tmp/usr/bin/java{,c}
+			;;
 	esac
 	# important to have our own (non-flawed one) since Python (from
 	# Portage) and binutils use it

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4e2041dc53c8f672761fc8b2f97c3b2be16224bf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 14:55:00 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 14:55:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4e2041dc

scripts/bootstrap-prefix: make sure we pull in matching libcxx

bug #574656 revealed in stage2 we use --nodeps for many reasons, so we
need to pin down the libcxx versions there too, for portage will not
satisfy dependencies there

 scripts/bootstrap-prefix.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e1e75fb..a62f9f8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -179,11 +179,23 @@ configure_toolchain() {
 			esac
 			# we always have to bootstrap with 3.4 for else we'd need
 			# libcxx, which only compiles with clang
-			local libcxx="sys-libs/libcxx-headers sys-libs/libcxxabi sys-libs/libcxx"
-			compiler_stage1+=" dev-libs/libffi <sys-devel/llvm-3.5 ${libcxx}"
+			compiler_stage1+=" dev-libs/libffi <sys-devel/llvm-3.5"
 			# similar, the deps for 3.6+ are too high (cmake, ninja,
 			# python) so we have to do this with an intermediate
-			compiler="${libcxx} sys-libs/csu dev-libs/libffi <sys-devel/llvm-3.6 <sys-devel/clang-3.6"
+			local cdep="3.5.9999"
+			# unfortunately, gmp needs c++, thus libcxx, so have to drag
+			# it in early (gmp is necessary for 3.5+)
+			local libcxx="
+				<sys-libs/libcxx-headers-${cdep}
+				<sys-libs/libcxxabi-${cdep}
+				<sys-libs/libcxx-${cdep}"
+			compiler_stage1+=" ${libcxx}"
+			compiler="
+				${libcxx}
+				sys-libs/csu
+				dev-libs/libffi
+				<sys-devel/llvm-${cdep}
+				<sys-devel/clang-${cdep}"
 			;;
 		*-*-aix*)
 			linker=sys-devel/native-cctools

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     48f8f07777a371fac6294c46ea98f24fbdcdd5d3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 18:30:26 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 18:30:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=48f8f077

scripts/bootstrap-prefix.sh: try to work around bug #575324

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a62f9f8..9d71e9b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1249,6 +1249,8 @@ bootstrap_stage3() {
 	( cd "${ROOT}"/usr/bin && test ! -e python && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
+	# try to get ourself out of the mudd, bug #575324
+	EXTRA_ECONF="--disable-compiler-version-checks" \
 	emerge_pkgs --nodeps ${compiler} || return 1
 	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python2.7 )
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     14f4da9f9a210bb993ae7e705ca87f06ebd69e7c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 17:06:10 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 17:06:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=14f4da9f

scripts/bootstrap-prefix.sh: drop workaround for bug #491098 now that we use Clang on OSX

 scripts/bootstrap-prefix.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9d71e9b..876d617 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -128,18 +128,15 @@ configure_cflags() {
 
 	case ${CHOST} in
 		# note: we need CXX for binutils-apple which' ld is c++
-		# Clang on OSX defaults to c99 mode, while GCC defaults to gnu89
-		# (C90 + extensions).  This makes Clang barf on GCC's sources, so
-		# work around that.  Bug #491098
 		*64-apple* | sparcv9-*-solaris* | x86_64-*-solaris*)
-			export CC="${CC-gcc} -m64 -std=gnu89"
+			export CC="${CC-gcc} -m64"
 			export CXX="${CXX-g++} -m64"
-			export HOSTCC="${CC-gcc} -m64 -std=gnu89"
+			export HOSTCC="${CC}"
 			;;
 		i*86-apple-darwin1*)
-			export CC="${CC-gcc} -m32 -std=gnu89"
+			export CC="${CC-gcc} -m32"
 			export CXX="${CXX-g++} -m32"
-			export HOSTCC="${CC-gcc} -m32 -std=gnu89"
+			export HOSTCC="${CC}"
 			;;
 		*)
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5647e88f5590822abfc8384892ebd44f3d215b6a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 18:13:52 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 18:13:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5647e88f

scripts/bootstrap-prefix: also define OBJC and OBJCXX for bug #575860

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 876d617..81ef629 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1165,6 +1165,8 @@ bootstrap_stage2() {
 			echo "# System compiler on Darwin Prefix is Clang, do not remove this"
 			echo "CC=${CHOST}-clang"
 			echo "CXX=${CHOST}-clang++"
+			echo "OBJC=${CHOST}-clang"
+			echo "OBJCXX=${CHOST}-clang++"
 			echo "BUILD_CC=${CHOST}-clang"
 			echo "BUILD_CXX=${CHOST}-clang++"
 		} >> "${ROOT}"/etc/portage/make.conf

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ba21295b4fc5f88833f0b9857a05a7b8879c003a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 20:41:31 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 20:41:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ba21295b

scripts/bootstrap-prefix: bump portage and snapshot

 scripts/bootstrap-prefix.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 81ef629..5d6fbc1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -393,7 +393,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20160211"
+	local PV="20160324"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -451,8 +451,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.2.20"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.2.20"
+	STABLE_PV="2.2.28"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.2.28"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"
@@ -469,8 +469,6 @@ bootstrap_portage() {
 	S="${S}/prefix-portage-${PV}"
 	cd "${S}"
 
-	patch -p1 < "${ROOT}"/usr/portage/sys-apps/portage/files/portage-2.2.10.1-brokentty-more-platforms.patch # now upstream
-
 	# disable ipc
 	sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
 		-i pym/_emerge/AbstractEbuildProcess.py || \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8ee55e7a6e7e75c367f944b6127ae0a7b5a61474
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 16:31:42 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 16:39:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8ee55e7a

do_emerge_pkgs: make sure USE-overrides mask built-in list

 scripts/bootstrap-prefix.sh | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5d6fbc1..94ac95d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1070,6 +1070,30 @@ do_emerge_pkgs() {
 		done
 		[[ -n ${pvdb} ]] && continue
 
+		local myuse=(
+			-berkdb
+			-fortran
+			-gdbm
+			-git
+			-libcxx
+			-nls
+			-pcre
+			-ssl
+			-python
+			bootstrap
+			clang
+			internal-glib
+		)
+		myuse=" ${myuse[*]} "
+		local use
+		for use in ${USE} ; do
+			myuse=" ${myuse/ ${use} /} "
+			myuse=" ${myuse/ -${use} /} "
+			myuse=" ${myuse/ ${use#-} /} "
+			myuse+=" ${use} "
+		done
+		myuse=( ${myuse} )
+
 		# Disable the STALE warning because the snapshot frequently gets stale.
 		#
 		# Need need to spam the user about news until the emerge -e system
@@ -1080,7 +1104,7 @@ do_emerge_pkgs() {
 		PORTAGE_SYNC_STALE=0 \
 		FEATURES="-news ${FEATURES}" \
 		PYTHONPATH="${ROOT}"/tmp/usr/lib/portage/pym \
-		USE="-berkdb -fortran -gdbm -git -libcxx -nls -pcre -ssl -python bootstrap clang internal-glib ${USE}" \
+		USE="${myuse[*]}" \
 		CFLAGS= CXXFLAGS= \
 		emerge -v --oneshot --root-deps ${opts} "${pkg}" || return 1
 	done

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     23d7631f8c99e03625576906f3b552de6608f959
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 16:33:46 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 16:40:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=23d7631f

stage3: emerge final packages without USE=-ssl

In the stage where portage is pulled in, we now need ssl.  So unmask
this here, so the depcalc will succeed.  We're far enough to be able to
compile ssl at this stage.

 scripts/bootstrap-prefix.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fd91236..8bba76f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1293,10 +1293,6 @@ bootstrap_stage3() {
 		sys-devel/make
 		sys-apps/file
 		app-admin/eselect
-		$( [[ ${OFFLINE_MODE} ]] || echo sys-devel/gettext )
-		$( [[ ${OFFLINE_MODE} ]] || echo net-misc/wget )
-		virtual/os-headers
-		sys-apps/portage
 	)
 	# for grep we need to do a little workaround as we use llvm-3.4
 	# here, which doesn't necessarily grok the system headers on newer
@@ -1304,6 +1300,17 @@ bootstrap_stage3() {
 	ac_cv_c_decl_report=warning \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
+	# gettext pulls in portage, which since 2.2.28 needs ssl enabled, so
+	# we need to lift our mask for that.
+	pkgs=(
+		$( [[ ${OFFLINE_MODE} ]] || echo sys-devel/gettext )
+		$( [[ ${OFFLINE_MODE} ]] || echo net-misc/wget )
+		virtual/os-headers
+		sys-apps/portage
+	)
+	USE="ssl" \
+	emerge_pkgs "" "${pkgs[@]}" || return 1
+
 	# Switch to the proper portage.
 	hash -r
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     121cfa636a8534e2df0fb61aae45a9a31a083645
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 16:33:04 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 16:39:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=121cfa63

do_emerge_pkgs: add some debugging to see what/hows's being emerged

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 94ac95d..fd91236 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1100,6 +1100,7 @@ do_emerge_pkgs() {
 		# because the tools aren't available to read the news item yet anyway.
 		#
 		# Avoid circular deps caused by the default profiles (and IUSE defaults).
+		echo "USE=${myuse[*]} PKG=${pkg}"
 		PORTAGE_CONFIGROOT="${EPREFIX}" \
 		PORTAGE_SYNC_STALE=0 \
 		FEATURES="-news ${FEATURES}" \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     310d3b077dc6eb0f8501d35ebf95c15237269ea6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 16:17:21 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 16:17:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=310d3b07

boostrap_stage3: don't need to set CONFIG_SHELL, it has a default

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 554b007..15c2300 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1279,9 +1279,9 @@ bootstrap_stage3() {
 	# Use $ROOT tools where possible from now on.
 	rm -f "${ROOT}"/bin/sh
 	ln -s bash "${ROOT}"/bin/sh
-	export CONFIG_SHELL="${ROOT}/bin/bash"
-	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
+	unset CONFIG_SHELL
 	unset MAKEINFO
+	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
 	# Build portage and dependencies.
 	pkgs=(

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b871c3bcbc88883b1ff252df4ddb24b196ce1e51
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 16:16:15 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 16:16:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b871c3bc

boostrap_stage3: set LDFLAGS to something relevant

An accidential typo (-I instead of -L) made bootstraps fail to link to
libs from the target prefix iso the temp prefix, resulting in breakage
when removed :(

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8492191..554b007 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1234,7 +1234,7 @@ bootstrap_stage3() {
 	configure_toolchain || return 1
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
 	export CPPFLAGS="-I${ROOT}/usr/include"
-	export LDFLAGS="-I${ROOT}/usr/lib"
+	export LDFLAGS="-L${ROOT}/usr/lib"
 	unset CC CXX
 
 	emerge_pkgs() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a28fb6f93bfed98b8f43265cb18b5766bde4ef91
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 16:15:51 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 16:15:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a28fb6f9

configure_toolchain: squash annoying message from gcc wrapper

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8bba76f..8492191 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -157,7 +157,7 @@ configure_toolchain() {
 			# for compilers choice, see bug:
 			# https://bugs.gentoo.org/show_bug.cgi?id=538366
 			compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
-			case "$( (unset CHOST; gcc --version) )" in
+			case "$( (unset CHOST; gcc --version 2>/dev/null) )" in
 				*"(GCC) 4.2.1 "*|*"Apple LLVM version "*)
 					linker=sys-devel/binutils-apple
 					if type -P clang > /dev/null ; then

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e11f1b9bf0948578854562dc1e7bbe5d88e29c9c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 12:43:08 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 12:43:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e11f1b9b

bootstrap-prefix.sh: bump tree snapshot for portage fix

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 15c2300..ef51e10 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -393,7 +393,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20160324"
+	local PV="20160405"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5e3964f28670d3be18cd8fd73ac845b50005158b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 09:43:50 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 09:43:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5e3964f2

bootstrap-prefix.sh: fix copyright

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ef51e10..e8042fe 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2006-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 2006-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Id: bootstrap-prefix.sh 61818 2014-01-08 07:28:16Z haubi $
 
 trap 'exit 1' TERM KILL INT QUIT ABRT

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d02bb93e507c03f813d136e6f20267d3187c3fd4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 06:22:31 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 06:22:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d02bb93e

prepare: ensure xcode-select is set to CommandLineTools

this is needed during the bootstrap, to be able to build llvm

 scripts/bootstrap-prefix.sh | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e8042fe..bce5ab8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1683,18 +1683,32 @@ EOF
 		echo "Great!  You appear to have a compiler in your PATH"
 	fi
 
-	if type -P xcode-select > /dev/null && [[ ! -d /usr/include ]] ; then
-		# bug #512032
-		cat << EOF
+	if type -P xcode-select > /dev/null ; then
+		if [[ ! -d /usr/include ]] ; then
+			# bug #512032
+			cat << EOF
 
 You don't have /usr/include, this thwarts me to build stuff.
 Please execute:
   xcode-select --install
 or install /usr/include in another way and try running me again.
 EOF
-		exit 1
-	fi
+			exit 1
+		fi
+		if [[ $(xcode-select -p) != */CommandLineTools ]] ; then
+			# to an extent, bug #564814 and bug #562800
+			cat << EOF
 
+Your xcode-select is not set to CommandLineTools.  This prevents builds
+from succeeding.  Switch to command line tools for the bootstrap to
+continue.  Please execute:
+  xcode-select -s /Library/Developer/CommandLineTools
+and try running me again.
+EOF
+			exit 1
+		fi
+	fi
+	
 	echo
 	local ncpu=
     case "${CHOST}" in

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     0bd19d05c7c7922a441d06236714dddae1a9e6b0
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Mon Apr 11 13:14:46 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 13:16:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0bd19d05

cygwin needs version in BUILDPYTHON already for static linking

 scripts/bootstrap-prefix.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bce5ab8..fbd9898 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -680,6 +680,24 @@ bootstrap_python() {
 		patch -p0 < "${DISTDIR}"/02_all_disable_modules_and_ssl.patch
 	fi
 
+	# --disable-shared causes modules to probably link against the
+	# executable name, which must be the real executable at runtime
+	# as well rather than some symlink (for Cygwin at least).
+	patch -p0 <<'EOP'
+--- Makefile.pre.in
++++ Makefile.pre.in
+@@ -185,1 +185,1 @@
+-BUILDPYTHON=	python$(BUILDEXE)
++BUILDPYTHON=	python$(VERSION)$(BUILDEXE)
+@@ -984,1 +984,1 @@
+-	export EXE; EXE="$(BUILDEXE)"; \
++	export HOSTPYTHON; HOSTPYTHON="$(HOSTPYTHON)"; \
+--- Lib/plat-generic/regen
++++ Lib/plat-generic/regen
+@@ -3,1 +3,1 @@
+-python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
++$HOSTPYTHON ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+EOP
 	local myconf=""
 
 	case $CHOST in

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     eaf5de24641209a71fdbe9d909a323c17e1d5c3b
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Wed Apr 13 14:06:52 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 14:06:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=eaf5de24

use newest gcc for Cygwin, not supported in gcc-4.7

 scripts/bootstrap-prefix.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fbd9898..d1570d4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -147,8 +147,16 @@ configure_toolchain() {
 	linker=sys-devel/binutils
 	local gcc_deps="dev-libs/gmp dev-libs/mpfr dev-libs/mpc"
 	compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc"
-	# The host may not have a functioning c++ toolchain, so use a stage1 compiler that can build with C only.
-	compiler_stage1="${gcc_deps} sys-devel/gcc-config <sys-devel/gcc-4.8"
+	compiler_stage1="${gcc_deps} sys-devel/gcc-config"
+	case ${CHOST} in
+	*-cygwin*)
+	  # not supported in gcc-4.7 yet, easy enough to install g++
+	  compiler_stage1+=" sys-devel/gcc"
+	  ;;
+	*)
+	  # The host may not have a functioning c++ toolchain, so use a stage1 compiler that can build with C only.
+	  compiler_stage1+=" <sys-devel/gcc-4.8"
+	esac
 
 	CC=gcc
 	CXX=g++

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0eb35fff68a674f36bfdcc54e9106f7e8447ee2e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 15:25:01 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 15:25:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0eb35fff

scripts/bootstrap-prefix: bump snapshot for profile fixes

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d1570d4..e2f5844 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -401,7 +401,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20160405"
+	local PV="20160420"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     9bdc54a37c52d55ebe0b704a9fbbca6b318bfaba
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 13:22:27 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 13:22:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9bdc54a3

scripts/bootstrap-prefix: workaround bug #575480

gcc gets confused due to swapping the linker (or us building it
wrongly/without USE=cxx) and doesn't emit -lgcc_s when it uses
libstdc++.  Therefore, inject it for the moment, until we built a new
gcc.

 scripts/bootstrap-prefix.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e2f5844..93f29a0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -144,7 +144,7 @@ configure_cflags() {
 }
 
 configure_toolchain() {
-	linker=sys-devel/binutils
+	linker="sys-devel/binutils"
 	local gcc_deps="dev-libs/gmp dev-libs/mpfr dev-libs/mpc"
 	compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc"
 	compiler_stage1="${gcc_deps} sys-devel/gcc-config"
@@ -1182,6 +1182,7 @@ bootstrap_stage2() {
 		sys-devel/binutils-config
 		$([[ ${CHOST} == *-aix* ]] && echo sys-apps/diffutils ) # gcc can't deal with aix diffutils, gcc PR14251
 	)
+
 	# Most binary Linux distributions seem to fancy toolchains that
 	# do not do c++ support (need to install a separate package).
 	USE="${USE} -cxx" \
@@ -1228,7 +1229,6 @@ bootstrap_stage2() {
 		# make sure the EPREFIX gcc shared libraries are there
 		mkdir -p "${ROOT}"/usr/${CHOST}/lib/gcc
 		cp "${ROOT}"/tmp/usr/${CHOST}/lib/gcc/* "${ROOT}"/usr/${CHOST}/lib/gcc
-
 	fi
 
 	einfo "stage2 successfully finished"
@@ -1291,6 +1291,13 @@ bootstrap_stage3() {
 	)
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
+	# On some hosts, gcc gets confused now when it uses the new linker,
+	# see for instance bug #575480.  While we would like to hide that
+	# linker, we can't since we want the compiler to pick it up.
+	# Therefore, inject some kludgy workaround, for deps like gmp that
+	# use c++
+	[[ ${CHOST} != *-darwin* ]] && export CXX="${CHOST}-g++ -lgcc_s"
+
 	# Clang unconditionally requires python, the eclasses are really not
 	# setup for a scenario where python doesn't live in the target
 	# prefix and no helpers are available
@@ -1307,6 +1314,7 @@ bootstrap_stage3() {
 	ln -s bash "${ROOT}"/bin/sh
 	unset CONFIG_SHELL
 	unset MAKEINFO
+	unset CXX
 	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
 	# Build portage and dependencies.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e240c31793de6b9bd04c206dcfd5c43d8e64aff5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 08:16:22 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 08:16:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e240c317

scripts/bootstrap-prefix: add libffi to stage2 for python's ctype in order to allow locale check to succeed

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 93f29a0..172911e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1175,6 +1175,7 @@ bootstrap_stage2() {
 		app-arch/xz-utils
 		sys-apps/gentoo-functions
 		sys-apps/baselayout-prefix
+		dev-libs/libffi
 		sys-devel/m4
 		sys-devel/flex
 		sys-devel/bison

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     f79e60287e93584c198227fe413cd9f042dea43f
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Thu Apr 28 09:25:42 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 09:25:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f79e6028

bootstrap-prefix.sh: unset CFLAGS&co, not empty

CFLAGS/CXXFLAGS in environment override profile values even if empty,
breaking bootstrap of 32bit prefix on 64bit linux at least.

 scripts/bootstrap-prefix.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 172911e..f24baa9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1127,13 +1127,16 @@ do_emerge_pkgs() {
 		#
 		# Avoid circular deps caused by the default profiles (and IUSE defaults).
 		echo "USE=${myuse[*]} PKG=${pkg}"
-		PORTAGE_CONFIGROOT="${EPREFIX}" \
-		PORTAGE_SYNC_STALE=0 \
-		FEATURES="-news ${FEATURES}" \
-		PYTHONPATH="${ROOT}"/tmp/usr/lib/portage/pym \
-		USE="${myuse[*]}" \
-		CFLAGS= CXXFLAGS= \
-		emerge -v --oneshot --root-deps ${opts} "${pkg}" || return 1
+		(
+			unset CFLAGS CXXFLAGS
+			PORTAGE_CONFIGROOT="${EPREFIX}" \
+			PORTAGE_SYNC_STALE=0 \
+			FEATURES="-news ${FEATURES}" \
+			PYTHONPATH="${ROOT}"/tmp/usr/lib/portage/pym \
+			USE="${myuse[*]}" \
+			emerge -v --oneshot --root-deps ${opts} "${pkg}" 
+		)
+		[[ $? -eq 0 ]] || return 1
 	done
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     fb002e4bedb20a1d5c52788530e084ffc5ca430f
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Wed Apr 27 13:41:04 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 15:05:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fb002e4b

bootstrap-prefix.sh: patch python to use dlltool for Cygwin

 scripts/bootstrap-prefix.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f24baa9..074276d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -691,6 +691,7 @@ bootstrap_python() {
 	# --disable-shared causes modules to probably link against the
 	# executable name, which must be the real executable at runtime
 	# as well rather than some symlink (for Cygwin at least).
+	# And with dlltool, find_library("c") can return "cygwin1.dll".
 	patch -p0 <<'EOP'
 --- Makefile.pre.in
 +++ Makefile.pre.in
@@ -705,6 +706,29 @@ bootstrap_python() {
 @@ -3,1 +3,1 @@
 -python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
 +$HOSTPYTHON ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+--- Lib/ctypes/util.py
++++ Lib/ctypes/util.py
+@@ -41,6 +41,20 @@
+                 continue
+         return None
+ 
++elif sys.platform == "cygwin":
++    def find_library(name):
++        for libdir in ['/usr/lib', '/usr/local/lib']:
++            for libext in ['lib%s.dll.a' % name, 'lib%s.a' % name]:
++                implib = os.path.join(libdir, libext)
++                if not os.path.exists(implib):
++                    continue
++                cmd = "dlltool -I " + implib + " 2>/dev/null"
++                res = os.popen(cmd).read().replace("\n","")
++                if not res:
++                    continue
++                return res
++        return None
++
+ elif os.name == "posix":
+     # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump
+     import re, tempfile, errno
 EOP
 	local myconf=""
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2bb3c6940c3000924d145515832797ae5bf29f31
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 09:31:08 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May  3 09:31:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2bb3c694

scripts/startprefix: retain some more useful env vars

 scripts/startprefix.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/startprefix.in b/scripts/startprefix.in
index aafd04d..861f02d 100644
--- a/scripts/startprefix.in
+++ b/scripts/startprefix.in
@@ -37,9 +37,15 @@ fi
 # give a small notice
 echo "Entering Gentoo Prefix ${EPREFIX}"
 # start the login shell, clean the entire environment but what's needed
+RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
 # PROFILEREAD is necessary on SUSE not to wipe the env on shell start
-[[ -n ${PROFILEREAD} ]] && DOPROFILEREAD="PROFILEREAD=${PROFILEREAD}"
-env -i HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL $DOPROFILEREAD $SHELL -l
+[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
+# ssh-agent is handy to keep, of if set, inherit it
+[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
+# if we're on some X terminal, makes sense to inherit that too
+[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
+# do it!
+env -i $RETAIN $SHELL -l
 # and leave a message when we exit... the shell might return non-zero
 # without having real problems, so don't send alarming messages about
 # that

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     824fd17a4b55d2fd53da24228bbd1ffefa6cf97c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 18:18:51 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 10 18:18:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=824fd17a

scripts/bootstrap-prefix: fix bootstrapping glib, bug #582104

 scripts/bootstrap-prefix.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 074276d..ad4de47 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1396,7 +1396,11 @@ bootstrap_stage3() {
 	# temporarily work around c_rehash missing openssl dependency, bug #572790
 	CFLAGS= CXXFLAGS= emerge -1 openssl || return 1
 
-	# Portage should figure out itself what it needs to do, if anything
+	# Portage should figure out itself what it needs to do, if anything.
+	# Avoid glib compiling for Cocoa libs if it finds them, since we're
+	# still with an old llvm that may not understand the system headers
+	# very well on Darwin (-DGNUSTEP_BASE_VERSION hack)
+	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
 	CFLAGS= CXXFLAGS= USE="-git" emerge -u system || return 1
 
 	# remove anything that we don't need (compilers most likely)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     f6dfc2c7a792c6c5cc0b8d4b77a7349a0b156383
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Thu May 12 12:53:56 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu May 12 13:40:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6dfc2c7

bootstrap-prefix.sh: symlink bin/ to usr/bin/ too

Since coreutils does support /bin as symlink, we can create the
bin -> usr/bin symlink as well.

 scripts/bootstrap-prefix.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ad4de47..3377cb7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -378,11 +378,14 @@ do_tree() {
 		[[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}"
 	done
 	if [[ ${PREFIX_DISABLE_USR_SPLIT} == "yes" ]] ; then
-		# note to self: don't make bin a symlink to usr/bin for
-		# coreutils installs symlinks to from usr/bin to bin, which in
-		# case they are the same boils down to a pointless indirection
-		# to self
-		for x in lib sbin ; do
+		# note to self: since coreutils now listens to
+		# PREFIX_DISABLE_GEN_USR_LDSCRIPT to avoid symlinks
+		# from usr/bin to bin, we can make bin a symlink as well
+		# This is necessary for Cygwin, as there is no such thing
+		# like an embedded runpath. Instead we put all the dlls
+		# next to the exes, to get them working even without the
+		# PATH environment variable being set up.
+		for x in lib sbin bin; do
 			[[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s usr/${x} )
 		done
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     24c8d94b431b33ab40719e6728dbd7dac5d86531
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Fri May 20 11:18:23 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri May 20 11:18:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=24c8d94b

Cygwin: use cmd to gain NUMBER_OF_PROCESSORS, for env -i

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3377cb7..74863d4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1781,7 +1781,7 @@ EOF
 	echo
 	local ncpu=
     case "${CHOST}" in
-		*-cygwin*)     ncpu=${NUMBER_OF_PROCESSORS}                        ;;
+		*-cygwin*)     ncpu=$(cmd /D /Q /C 'echo %NUMBER_OF_PROCESSORS%')  ;;
 		*-darwin*)     ncpu=$(/usr/sbin/sysctl -n hw.ncpu)                 ;;
 		*-freebsd*)    ncpu=$(/sbin/sysctl -n hw.ncpu)                     ;;
 		*-solaris*)    ncpu=$(/usr/sbin/psrinfo | wc -l)                   ;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     cae7024e8a2282ddefc150fab1e274a476e41180
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Fri May 20 11:25:41 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri May 20 11:25:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cae7024e

bootstrap-prefix.sh: drop cygwin profile versioning; check minimum cygwin version

 scripts/bootstrap-prefix.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 74863d4..0ba0d5a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -317,10 +317,10 @@ bootstrap_setup() {
 			profile="prefix/windows/winnt/${CHOST#i586-pc-winnt}/x86"
 			;;
 		i686-pc-cygwin*)
-			profile="prefix/windows/cygwin/${CHOST#i686-pc-cygwin}/x86"
+			profile="prefix/windows/cygwin/x86"
 			;;
 		x86_64-pc-cygwin*)
-			profile="prefix/windows/cygwin/${CHOST#x86_64-pc-cygwin}/x64"
+			profile="prefix/windows/cygwin/x64"
 			;;
 		hppa64*-hp-hpux11*)
 			profile="prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa64"
@@ -2213,12 +2213,9 @@ if [[ -z ${CHOST} ]]; then
 				;;
 			CYGWIN*)
 				case `uname -r` in
-					1.7*) # http://www.cygwin.com/ml/cygwin/2009-02/msg00669.html
-						CHOST="`uname -m`-pc-cygwin1.7"
-					;;
-					2.[0-9]*) # https://sourceware.org/ml/cygwin/2015-04/msg00595.html
-						# probably split on important features
-						CHOST="`uname -m`-pc-cygwin2.0"
+					[0-1].*|2.[0-4].*|2.5.[0-1]|2.5.[0-1]'('*)
+						eerror "Can't deal with Cygwin before 2.5.2 or so, sorry!"
+						exit 1
 					;;
 					*)
 						CHOST="`uname -m`-pc-cygwin"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     fd77eb779f23f839d9ee85d4bb39dce01915dd41
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 11:38:22 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu May 26 04:20:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fd77eb77

scripts/bootstrap-prefix.sh: openrc-run shebang place holder.

 scripts/bootstrap-prefix.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0ba0d5a..228bf90 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1373,6 +1373,10 @@ bootstrap_stage3() {
 		virtual/os-headers
 		sys-apps/portage
 	)
+	if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
+		echo "We need openrc-run at ${ROOT}/sbin to merge rsync." > "${ROOT}"/sbin/openrc-run
+		chmod +x "${ROOT}"/sbin/openrc-run
+	fi
 	USE="ssl" \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     97eaacb8d639bf71d1fa54ff562ec9dcb9060380
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 07:08:40 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu May 26 13:55:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=97eaacb8

scripts/bootstrap-prefix.sh: match bison 3 and above in stage1.

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 228bf90..e5ad6b6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1016,7 +1016,7 @@ bootstrap_stage1() { (
 	[[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null || (bootstrap_wget) || return 1
 	[[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1
 	[[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1
-	[[ $(bison --version 2>&1) == *"(GNU Bison) 2."[345678]* ]] \
+	[[ $(bison --version 2>&1) =~ GNU" "Bison") "(2.[3-7]|[3-9]) ]] \
 		|| [[ -x ${ROOT}/tmp/usr/bin/bison ]] \
 		|| (bootstrap_bison) || return 1
 	[[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     565458ece8f16dabdd04f0b6e4f4b2afddd98209
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 05:18:13 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 01:46:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=565458ec

scripts/bootstrap-prefix.sh: use the newest wget in stage1.

  wget-1.13.4 fails on CentOS 7.

  ./stdio.h:1012:1: error: 'gets' undeclared here (not in a function)
  _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e5ad6b6..5a2e277 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -897,7 +897,7 @@ bootstrap_findutils() {
 }
 
 bootstrap_wget() {
-	bootstrap_gnu wget 1.13.4
+	bootstrap_gnu wget 1.17.1 || bootstrap_gnu wget 1.13.4
 }
 
 bootstrap_grep() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ccd402ab61f08764a770041e40aa8f66e9fff024
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 07:06:54 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 07:06:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ccd402ab

scripts/bootstrap-prefix: provide working hint for OpenIndiana

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5a2e277..83ec9e0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1711,7 +1711,7 @@ from here, eh?  I just think you didn't install one.  I know it can be
 tricky on OpenIndiana, for instance, so won't blame you.  In case you're
 on OpenIndiana, I'll help you a bit.  Perform the following as
 super-user:
-  pkg install developer/gnu system/library/math/header-math
+  pkg install developer/gnu system/header
 In the meanwhile, I'll wait here until you run me again, with a compiler.
 EOF
 				fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     4183c9ff022a46dd0cc4e7ddfdd553bc4db7aca4
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 07:30:48 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 07:31:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4183c9ff

bootstrap-prefix.sh: add sys-apps/diffutils in stage2.

  It is needed by bison-3 build system.

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 83ec9e0..cde771d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1208,10 +1208,10 @@ bootstrap_stage2() {
 		dev-libs/libffi
 		sys-devel/m4
 		sys-devel/flex
+		sys-apps/diffutils # needed by bison-3 build system
 		sys-devel/bison
 		sys-devel/patch
 		sys-devel/binutils-config
-		$([[ ${CHOST} == *-aix* ]] && echo sys-apps/diffutils ) # gcc can't deal with aix diffutils, gcc PR14251
 	)
 
 	# Most binary Linux distributions seem to fancy toolchains that

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b0b1b89242da65cabd4cbc034ef3fdbe01c5773d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 07:43:27 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 07:43:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b0b1b892

scripts/bootstrap-prefix.sh: bump snapshot for Solaris fixes, bug #585918

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cde771d..feeb58b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -404,7 +404,7 @@ do_tree() {
 }
 
 bootstrap_tree() {
-	local PV="20160420"
+	local PV="20160614"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     5fd4217cded80abf580361e5d232b99f0fcb0902
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 14:15:04 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 07:58:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5fd4217c

bootstrap-prefix.sh: move up curl

  add -f option to test against download failures.

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9cda6b8..3c57b92 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -42,13 +42,13 @@ efetch() {
 			# curl, FreeBSD's fetch and ftp.
 			if [[ x$(type -t wget) == "xfile" ]] ; then
 				FETCH_COMMAND="wget"
-			elif [[ x$(type -t ftp) == "xfile" ]] ; then
-				FETCH_COMMAND="ftp"
 			elif [[ x$(type -t curl) == "xfile" ]] ; then
 				einfo "WARNING: curl doesn't fail when downloading fails, please check its output carefully!"
-				FETCH_COMMAND="curl -L -O"
+				FETCH_COMMAND="curl -f -L -O"
 			elif [[ x$(type -t fetch) == "xfile" ]] ; then
 				FETCH_COMMAND="fetch"
+			elif [[ x$(type -t ftp) == "xfile" ]] ; then
+				FETCH_COMMAND="ftp"
 			else
 				eerror "no suitable download manager found (need wget, curl, fetch or ftp)"
 				eerror "could not download ${1##*/}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     d9f3ca959f9e89ff89e1bdfb9fb642eb31eedc50
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 06:01:04 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 07:58:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d9f3ca95

s/bootstrap-prefix.sh: figure out ABI flags of x86.

 scripts/bootstrap-prefix.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index feeb58b..9cda6b8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -138,7 +138,11 @@ configure_cflags() {
 			export CXX="${CXX-g++} -m32"
 			export HOSTCC="${CC}"
 			;;
-		*)
+		i*86-pc-linux-gnu)
+			if [[ $(${CC} -dumpspecs | grep -A1 multilib_default) != *m32 ]]; then
+				export CC="${CC-gcc} -m32"
+				export CXX="${CXX-g++} -m32"
+			fi
 			;;
 	esac
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     4557631dcc108d099859ffcd7b7901ce5a4b8c9e
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 10:10:17 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 10:11:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4557631d

bootstrap-prefix.sh: gzip is a valid portage dependency.

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3c57b92..a171e97 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1356,6 +1356,7 @@ bootstrap_stage3() {
 	pkgs=(
 		sys-apps/coreutils
 		sys-apps/findutils
+		app-arch/gzip
 		app-arch/tar
 		sys-apps/grep
 		sys-apps/gawk

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     32258504fb1e2f55da459b50001dc97c830986db
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 08:18:37 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=32258504

scripts/bootstrap-prefix.sh: startprefix for RAP.

 scripts/bootstrap-prefix.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3eef582..a46ccdf 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -484,6 +484,13 @@ bootstrap_startscript() {
 	# currently I think right into the prefix is the best location, as
 	# putting it in /bin or /usr/bin just hides it some more for the
 	# user
+	if is-rap ; then
+		mkdir -p "${ROOT}"/usr/portage/scripts
+		wget --no-check-certificate \
+		     https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/startprefix.in \
+		     -O "${ROOT}"/usr/portage/scripts/startprefix.in
+	fi
+
 	sed \
 		-e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \
 		"${ROOT}"/usr/portage/scripts/startprefix.in \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     f3c51fb01b54321c026cfb2857ba3ee65cecaf98
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  4 07:25:15 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f3c51fb0

s/bootstrap-prefix.sh: remove EPREFIX/tmp after "emerge -e system".

  partially reverts 3a945696443b.

  A rerun of bootstrap script after "emerge -e system" failure
  should not go through stage1 again.

 scripts/bootstrap-prefix.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a46ccdf..e05c81a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1520,12 +1520,6 @@ bootstrap_stage3() {
 	# Switch to the proper portage.
 	hash -r
 
-	# Get rid of the temporary tools.
-	if [[ -d ${ROOT}/tmp/var/tmp ]] ; then
-		rm -rf "${ROOT}"/tmp
-		mkdir "${ROOT}"/tmp
-	fi
-
 	# Update the portage tree.
 	treedate=$(date -f "${ROOT}"/usr/portage/metadata/timestamp +%s)
 	nowdate=$(date +%s)
@@ -2173,7 +2167,13 @@ EOF
 
 	hash -r  # tmp/* stuff is removed in stage3
 
-	if ! emerge -e system ; then
+	if emerge -e system ; then
+		# Now, after 'emerge -e system', we can get rid of the temporary tools.
+		if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then
+			rm -Rf "${EPREFIX}"/tmp || return 1
+			mkdir -p "${EPREFIX}"/tmp || return 1
+		fi
+	else
 		# emerge -e system fail
 		cat << EOF
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     166387d875842c64c191dc86f7fc5719c2cc56d1
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 01:43:34 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=166387d8

bootstrap-prefix.sh: no USR SPLIT for RAP.  Support Debian multiarch.

 scripts/bootstrap-prefix.sh | 82 +++------------------------------------------
 1 file changed, 5 insertions(+), 77 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0fadb13..af2f690 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -229,7 +229,7 @@ bootstrap_setup() {
 			echo "CONFIG_SHELL=\"${ROOT}/bin/bash\""
 			echo "# sandbox does not work well on Prefix, bug 490246"
 			echo 'FEATURES="-usersandbox -sandbox"'
-			if [[ -n ${PREFIX_DISABLE_USR_SPLIT} ]] ; then
+			if [[ !is-rap && -n ${PREFIX_DISABLE_USR_SPLIT} ]] ; then
 				echo
 				echo "# This disables /usr-split, removing this will break"
 				echo "PREFIX_DISABLE_GEN_USR_LDSCRIPT=yes"
@@ -1476,83 +1476,11 @@ bootstrap_interactive() {
 	# eventually ends up in make.conf, see the end of stage3.  We don't
 	# do this in bootstrap_setup() because in that case we'd also have
 	# to cater for getting this right with manual bootstraps.
-	export PREFIX_DISABLE_USR_SPLIT=yes 
+	is-rap || export PREFIX_DISABLE_USR_SPLIT=yes
 
-	# immediately die on platforms that we know are impossible due to
-	# brain-deadness (Debian/Ubuntu) or extremely hard dependency chains
-	# (TODO NetBSD/OpenBSD)
-	case ${CHOST} in
-		*-linux-gnu)
-			local toolchain_impossible=
-			# Figure out if this is Ubuntu...
-			if [[ $(lsb_release -is 2>/dev/null) == "Ubuntu" ]] ; then
-				case "$(lsb_release -sr)" in
-					[456789].*|10.*)
-						: # good versions
-						;;
-					*)
-						# Debian/Ubuntu have seriously fscked up their
-						# toolchain to support their multi-arch crap
-						# since Natty (11.04) that noone really wants,
-						# and certainly not upstream.  Some details:
-						# https://bugs.launchpad.net/ubuntu/+source/binutils/+bug/738098
-						toolchain_impossible="Ubuntu >= 11.04 (Natty)"
-						;;
-				esac
-			fi
-			# Figure out if this is Debian
-			if [[ -e /etc/debian_release ]] ; then
-				case "$(< /etc/debian_release)" in
-					hamm/*|slink/*|potato/*|woody/*|sarge/*|etch/*|lenny/*|squeeze/*)
-						: # good versions
-						;;
-					*)
-						# Debian introduced their big crap since Wheezy
-						# (7.0), like for Ubuntu, see above
-						toolchain_impossible="Debian >= 7.0 (Wheezy)"
-						;;
-				esac
-			fi
-			if [[ -n ${toolchain_impossible} ]] ; then
-				# In short, it's impossible for us to compile a
-				# compiler, since 1) gcc picks up our ld, which doesn't
-				# support sysroot (can work around with a wrapper
-				# script), 2) headers and libs aren't found (symlink
-				# them to Prefix), 3) stuff like crtX.i isn't found
-				# during bootstrap, since the bootstrap compiler doesn't
-				# get any of our flags and doesn't know where to find
-				# them (even if we copied them).  So we cannot do this,
-				# unless we use the Ubuntu patches in our ebuilds, which
-				# is a NO-GO area.
-				cat << EOF
-Oh My!  ${toolchain_impossible}!  AAAAAAAAAAAAAAAAAAAAARGH!  HELL comes over me!
-
-EOF
-				echo -n "..."
-				sleep 1
-				echo -n "."
-				sleep 1
-				echo -n "."
-				sleep 1
-				echo -n "."
-				sleep 1
-				echo
-				echo
-				cat << EOF
-and over you.  You're on the worst Linux distribution from a developer's
-(and so Gentoo Prefix) perspective since http://wiki.debian.org/Multiarch/.
-Due to this multi-arch idea, it is IMPOSSIBLE for Gentoo Prefix to
-bootstrap a compiler without using Debuntu patches, which is an absolute
-NO-GO area!  GCC and binutils upstreams didn't just reject those patches
-for fun.
-
-I really can't help you, and won't waste any of your time either.  The
-story simply ends here.  Sorry.
-EOF
-				exit 1
-			fi
-			;;
-	esac
+	# TODO should immediately die on platforms that we know are
+	# impossible due extremely hard dependency chains
+	# (NetBSD/OpenBSD)
 
 	cat <<"EOF"
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     78bbfbe705e029c6bcf8ef7323baa07ff299a526
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 02:17:28 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=78bbfbe7

scripts/b-p.sh: calculate kernel version and select legacy profiles.

 scripts/bootstrap-prefix.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 79ebc62..3eef582 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -218,6 +218,11 @@ configure_toolchain() {
 bootstrap_setup() {
 	local profile=""
 	einfo "setting up some guessed defaults"
+
+	# 2.6.32.1 -> 2*256^3 + 6*256^2 + 32 * 256 + 1 = 33955841
+	kver() { uname -r|cut -d\- -f1|awk -F. '{for (i=1; i<=NF; i++){s+=lshift($i,(4-i)*8)};print s}'; }
+	# >=glibc-2.20 requires >=linux-2.6.32.
+	profile-legacy() { [[ $(kver) -ge 33955840 ]] || echo /legacy; }
 	
 	if [[ ! -f ${ROOT}/etc/portage/make.conf ]] ; then
 		{
@@ -267,6 +272,7 @@ bootstrap_setup() {
 			ln -sf {,"${ROOT}"}/etc/group
 		[[ -f ${ROOT}/etc/resolv.conf ]] || ln -s {,"${ROOT}"}/etc/resolv.conf
 		[[ -f ${ROOT}/etc/hosts ]] || cp {,"${ROOT}"}/etc/hosts
+		local legacy=$(profile-legacy)
 	fi
 
 	local linux=$(rapx linux-standalone linux)
@@ -296,22 +302,22 @@ bootstrap_setup() {
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
 		i*86-pc-linux-gnu)
-			profile="prefix/${linux}/x86"
+			profile="prefix/${linux}/x86${legacy}"
 			;;
 		x86_64-pc-linux-gnu)
-			profile="prefix/${linux}/amd64"
+			profile="prefix/${linux}/amd64${legacy}"
 			;;
 		ia64-pc-linux-gnu)
-			profile="prefix/${linux}/ia64"
+			profile="prefix/${linux}/ia64${legacy}"
 			;;
 		powerpc-unknown-linux-gnu)
-			profile="prefix/${linux}/ppc"
+			profile="prefix/${linux}/ppc${legacy}"
 			;;
 		powerpc64-unknown-linux-gnu)
-			profile="prefix/${linux}/ppc64"
+			profile="prefix/${linux}/ppc64${legacy}"
 			;;
 		armv7l-pc-linux-gnu)
-			profile="prefix/${linux}/arm"
+			profile="prefix/${linux}/arm${legacy}"
 			;;
 		sparc-sun-solaris2.9)
 			profile="prefix/sunos/solaris/5.9/sparc"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     9ffa5b5a5e69f5d62ea3f56654d22ca549d531fc
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 10:46:14 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9ffa5b5a

scripts/bootstrap-prefix.sh: USE=-acl for linux-standalone.

  Its profile does not mask acl.

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8b22f83..fda71fb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1169,6 +1169,7 @@ do_emerge_pkgs() {
 		[[ -n ${pvdb} ]] && continue
 
 		local myuse=(
+			-acl
 			-berkdb
 			-fortran
 			-gdbm

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     0af56bfa67625683611aee6b65262c0a9743df98
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 02:09:52 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0af56bfa

scripts/bootstrap-prefix.sh: support sys-libs/glibc.
  - lto of gcc should be disabled. ld points to the host dynamic
    loader and gcc points to the RAP one, ld cannot load the gcc
    lto plugin.

  - stage tools should be used first in stage3.

  - makeinfo, perl are faked.

  - no need to copy libgcc on RAP.
    ld.so of glibc does that.

  - install texinfo for glibc.

  - stage3 linker can only be compiled after compiler.

    otherwise stage2 gcc will mix host glibc headers with those of
    stage3.

 scripts/bootstrap-prefix.sh | 104 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 81 insertions(+), 23 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 45c2552..9e3e4fd 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1286,9 +1286,11 @@ bootstrap_stage2() {
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	
 	# Build a linker and compiler that live in ${ROOT}/tmp, but
-	# produce binaries in ${ROOT}.
+	# produce binaries in ${ROOT}. Debian multiarch supported by RAP
+	# needs ld to support sysroot.
 	USE="${USE} -cxx" \
 	TPREFIX="${ROOT}" \
+	EXTRA_ECONF=$(rapx --with-sysroot=/) \
 	emerge_pkgs --nodeps ${linker} || return 1
 
 	# gmp has cxx flag enabled by default. When dealing with a host
@@ -1296,6 +1298,7 @@ bootstrap_stage2() {
 	# package.use to disable in the temporary prefix.  
 	echo "dev-libs/gmp -cxx" >> "${ROOT}"/tmp/etc/portage/package.use
 
+	BOOTSTRAP_RAP_STAGE2=yes \
 	EXTRA_ECONF="--disable-bootstrap" \
 	GCC_MAKE_TARGET=all \
 	TPREFIX="${ROOT}" \
@@ -1322,7 +1325,7 @@ bootstrap_stage2() {
 		# multilib.eclass -- can't blame it at this point really)
 		# do it ourselves here to make the bootstrap continue
 		( cd "${ROOT}"/tmp/usr/bin && ln -s clang ${CHOST}-clang && ln -s clang++ ${CHOST}-clang++ )
-	else
+	elif ! is-rap ; then
 		# make sure the EPREFIX gcc shared libraries are there
 		mkdir -p "${ROOT}"/usr/${CHOST}/lib/gcc
 		cp "${ROOT}"/tmp/usr/${CHOST}/lib/gcc/* "${ROOT}"/usr/${CHOST}/lib/gcc
@@ -1363,6 +1366,8 @@ bootstrap_stage3() {
 	unset CC CXX
 
 	emerge_pkgs() {
+		# stage3 tools should be used first.
+		DEFAULT_PATH="${ROOT}"$(echo /{,tmp/}{,usr/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" \
 		do_emerge_pkgs "$@"
 	}
@@ -1370,25 +1375,63 @@ bootstrap_stage3() {
 	# GCC sometimes decides that it needs to run makeinfo to update some
 	# info pages from .texi files.  Obviously we don't care at this
 	# stage and rather have it continue instead of abort the build
-	export MAKEINFO="echo makeinfo GNU texinfo 4.13"
-	
-	# Build a native compiler.
-	pkgs=(
-		$([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency
-		sys-libs/ncurses
-		sys-libs/readline
-		app-shells/bash
-		sys-apps/sed
-		app-arch/xz-utils
-		sys-apps/gentoo-functions
-		sys-apps/baselayout-prefix
-		sys-devel/m4
-		sys-devel/flex
-		sys-devel/binutils-config
-		sys-libs/zlib
-		${linker}
-	)
-	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+	[[ -x "${ROOT}"/usr/bin/makeinfo ]] || cat > "${ROOT}"/usr/bin/makeinfo <<-EOF
+		#!${ROOT}/bin/bash
+		echo "makeinfo GNU texinfo 4.13"
+		for a in \$@; do
+		case \$a in
+		--*) f=\$(echo "\$a" | sed -r 's,--.*=(.*),\1,') ;;
+		-*) ;;
+		*) f=\$a ;;
+		esac
+		[[ -e \$f ]] || touch \$f
+		done
+		EOF
+	chmod +x "${ROOT}"/usr/bin/makeinfo
+	export INSTALL_INFO="${ROOT}"/usr/bin/makeinfo
+
+	if is-rap ; then
+		# We need ${ROOT}/usr/bin/perl to merge glibc.
+		if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then
+			# trick "perl -V:apiversion" check of glibc-2.19.
+			echo -e "#!${ROOT}/bin/sh\necho 'apiversion=9999'" > "${ROOT}"/usr/bin/perl
+			chmod +x "${ROOT}"/usr/bin/perl
+		fi
+		# Tell dynamic loader the path of libgcc_s.so of stage2
+		if [[ ! -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf ]]; then
+			mkdir -p "${ROOT}"/etc/ld.so.conf.d
+			dirname $(gcc -print-libgcc-file-name) > "${ROOT}"/etc/ld.so.conf.d/stage2.conf
+		fi
+
+		pkgs=(
+			sys-apps/baselayout
+			sys-apps/gentoo-functions
+			sys-kernel/linux-headers
+			sys-libs/glibc
+			sys-libs/zlib
+		)
+
+		BOOTSTRAP_RAP=yes \
+		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+	else
+		pkgs=(
+			$([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency
+			sys-libs/ncurses
+			sys-libs/readline
+			app-shells/bash
+			sys-apps/sed
+			app-arch/xz-utils
+			sys-apps/gentoo-functions
+			sys-apps/baselayout-prefix
+			sys-devel/m4
+			sys-devel/flex
+			sys-devel/binutils-config
+			sys-libs/zlib
+			${linker}
+		)
+
+		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+	fi
 
 	# On some hosts, gcc gets confused now when it uses the new linker,
 	# see for instance bug #575480.  While we would like to hide that
@@ -1403,11 +1446,23 @@ bootstrap_stage3() {
 	( cd "${ROOT}"/usr/bin && test ! -e python && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
+
+	RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
 	# try to get ourself out of the mudd, bug #575324
-	EXTRA_ECONF="--disable-compiler-version-checks" \
+	EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \
+	LDFLAGS="${LDFLAGS} $(rapx -Wl,--dynamic-linker=${RAP_DLINKER})" \
 	emerge_pkgs --nodeps ${compiler} || return 1
-	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python2.7 )
+	# undo libgcc_s.so path of stage2
 
+	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
+	if is-rap ; then
+		"${ROOT}"/usr/sbin/ldconfig
+		# should be linked against stage3 zlib, and can only
+		# be compiled after gcc has the headers of Prefix glibc.
+		emerge_pkgs --nodeps sys-devel/binutils-config ${linker} || return 1
+	fi
+
+	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python2.7 )
 	# Use $ROOT tools where possible from now on.
 	rm -f "${ROOT}"/bin/sh
 	ln -s bash "${ROOT}"/bin/sh
@@ -1479,6 +1534,9 @@ bootstrap_stage3() {
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
 	CFLAGS= CXXFLAGS= USE="-git" emerge -u system || return 1
 
+	# TODO, glibc should depend on texinfo
+	is-rap && { emerge sys-apps/texinfo || return 1; }
+
 	# remove anything that we don't need (compilers most likely)
 	emerge --depclean
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     4bca0eda63345255cd61d2f98dd42cf7cf13c9de
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 01:46:57 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4bca0eda

bootstrap-prefix.sh: get_libdir for multilib support on RAP.

 scripts/bootstrap-prefix.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index af2f690..fd35927 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -412,7 +412,7 @@ bootstrap_setup() {
 
 do_tree() {
 	local x
-	for x in etc{,/portage} usr/{{,s}bin,lib} var/tmp var/lib/portage var/log/portage var/db;
+	for x in etc{,/portage} usr/{{,s}bin,$(rapx "" lib)} var/tmp var/lib/portage var/log/portage var/db;
 	do
 		[[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}"
 	done
@@ -428,7 +428,7 @@ do_tree() {
 			[[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s usr/${x} )
 		done
 	else
-		for x in lib sbin ; do
+		for x in $(rapx "" lib) sbin ; do
 			[[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}"
 		done
 	fi
@@ -537,7 +537,8 @@ bootstrap_portage() {
 	[[ -x ${ROOT}/tmp/bin/bash ]] || [[ ! -x ${ROOT}/tmp/usr/bin/bash ]] || ln -s ../usr/bin/bash "${ROOT}"/tmp/bin/bash || return 1
 	[[ -x ${ROOT}/tmp/bin/bash ]] || ln -s "${BASH}" "${ROOT}"/tmp/bin/bash || return 1
 	[[ -x ${ROOT}/tmp/bin/sh ]] || ln -s bash "${ROOT}"/tmp/bin/sh || return 1
-	[[ -x ${ROOT}/bin/sh ]] || ln -s ../tmp/bin/sh "${ROOT}"/bin/sh || return 1
+	[[ -x ${ROOT}/bin/bash ]] || ln -s ../tmp/bin/bash "${ROOT}"/bin/bash || return 1
+	[[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1
 	export PORTAGE_BASH="${ROOT}"/tmp/bin/bash
 
 	einfo "Compiling ${A%-*}"
@@ -1336,10 +1337,12 @@ bootstrap_stage3() {
 		fi
 	fi
 
+	get_libdir() { portageq envvar LIBDIR_$(portageq envvar ABI) || echo lib; }
+
 	configure_toolchain || return 1
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
 	export CPPFLAGS="-I${ROOT}/usr/include"
-	export LDFLAGS="-L${ROOT}/usr/lib"
+	export LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
 	unset CC CXX
 
 	emerge_pkgs() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     daafd832275fb9ef9031f804d0625ec9d8ba60ed
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 02:19:28 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=daafd832

scripts/bootstrap-prefix.sh: setup android overlay as staged RAP repo.

  setup name databases.

 scripts/bootstrap-prefix.sh | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ce4ccba..8b22f83 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -239,6 +239,34 @@ bootstrap_setup() {
 		} > "${ROOT}"/etc/portage/make.conf
 	fi
 
+	if is-rap && [[ ! -f ${ROOT}/etc/portage/repos.conf ]] ; then
+		cat  >"${ROOT}"/etc/portage/repos.conf <<-EOF
+			[DEFAULT]
+			main-repo = gentoo
+			eclass-overrides = rap
+
+			[gentoo]
+			location = ${ROOT}/usr/portage
+			sync-type = rsync
+			sync-uri = rsync://rsync.gentoo.org/gentoo-portage
+
+			[rap]
+			location = ${ROOT}/usr/portage-stage
+			sync-type = git
+			sync-uri = https://anongit.gentoo.org/git/proj/android.git
+			auto-sync = no
+			EOF
+	fi
+
+	if is-rap ; then
+		[[ -f ${ROOT}/etc/passwd ]] || getent passwd > "${ROOT}"/etc/passwd || \
+			ln -sf {,"${ROOT}"}/etc/passwd
+		[[ -f ${ROOT}/etc/group ]] || getent group > "${ROOT}"/etc/group || \
+			ln -sf {,"${ROOT}"}/etc/group
+		[[ -f ${ROOT}/etc/resolv.conf ]] || ln -s {,"${ROOT}"}/etc/resolv.conf
+		[[ -f ${ROOT}/etc/hosts ]] || cp {,"${ROOT}"}/etc/hosts
+	fi
+
 	local linux=$(rapx linux-standalone linux)
 	
 	case ${CHOST} in
@@ -421,6 +449,10 @@ bootstrap_tree() {
 	else
 		do_tree http://dev.gentoo.org/~grobian/distfiles prefix-overlay-${PV}.tar.bz2
 	fi
+	if is-rap; then
+		PORTDIR="${ROOT}/usr/portage-stage" \
+		       do_tree http://dev.gentoo.org/~heroxbd android-master.tar.bz2
+	fi
 }
 
 bootstrap_startscript() {
@@ -530,7 +562,9 @@ bootstrap_portage() {
 
 	[[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" "${ROOT}"/tmp/usr/portage
 
-	if [[ -s ${PORTDIR}/profiles/repo_name ]]; then
+	if is-rap; then
+		cp -f "${ROOT}"/etc/portage/repos.conf "${ROOT}"/tmp/usr/share/portage/config/repos.conf
+	elif [[ -s ${PORTDIR}/profiles/repo_name ]]; then
 		# sync portage's repos.conf with the tree being used
 		sed -i -e "s,gentoo_prefix,$(<"${PORTDIR}"/profiles/repo_name)," "${ROOT}"/tmp/usr/share/portage/config/repos.conf || return 1
 	fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     fad549e3409daad1e30fcdc3653b58c31fc9d951
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 01:41:56 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fad549e3

scripts/bootstrap-prefix.sh: disable sandbox.

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fda71fb..0fadb13 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -227,6 +227,8 @@ bootstrap_setup() {
 			echo 'CXXFLAGS="${CFLAGS}"'
 			echo "MAKEOPTS=\"${MAKEOPTS}\""
 			echo "CONFIG_SHELL=\"${ROOT}/bin/bash\""
+			echo "# sandbox does not work well on Prefix, bug 490246"
+			echo 'FEATURES="-usersandbox -sandbox"'
 			if [[ -n ${PREFIX_DISABLE_USR_SPLIT} ]] ; then
 				echo
 				echo "# This disables /usr-split, removing this will break"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     15ae1999d07446d243021983ee77d89f2335f141
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 06:59:33 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=15ae1999

scripts/b-p.sh: link /usr/{lib -> lib64} in stage1

  on systems get_libdir != lib,
  python (looks into /usr/lib by default) need to find libffi
  (installs into /usr/lib64 by default).

  ugly enumerating all possible libdirs.

 scripts/bootstrap-prefix.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fd35927..45c2552 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1103,6 +1103,23 @@ bootstrap_stage1() { (
 			chmod 755 "${ROOT}"/tmp/usr/bin/java{,c}
 			;;
 	esac
+	# Host compiler can output a variety of libdirs.  At stage1,
+	# they should be the same as lib.  Otherwise libffi may not be
+	# found by python.
+	if is-rap ; then
+		[[ -d ${ROOT}/tmp/usr/lib ]] || mkdir -p "${ROOT}"/tmp/usr/lib
+		local libdir
+		for libdir in lib64 lib32 libx32; do
+			if [[ ! -L ${ROOT}/tmp/usr/${libdir} ]] ; then
+				if [[ -e "${ROOT}"/tmp/usr/${libdir} ]] ; then
+					echo "${ROOT}"/tmp/usr/${libdir} should be a symlink to lib
+					return 1
+				fi
+				ln -s lib "${ROOT}"/tmp/usr/${libdir}
+			fi
+		done
+	fi
+
 	# important to have our own (non-flawed one) since Python (from
 	# Portage) and binutils use it
 	for zlib in ${ROOT}/tmp/usr/lib/libz.* ; do

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     3e946a0d0d4c71840479599f48b1f4901d84eb83
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 09:49:05 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3e946a0d

scripts/bootstrap-prefix.sh: emacs local setup for the code standard.

 scripts/bootstrap-prefix.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 438e0be..ce4ccba 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2449,3 +2449,8 @@ fi
 einfo "ready to bootstrap ${TODO}"
 # bootstrap_interactive proceeds with guessed defaults when TODO=noninteractive
 bootstrap_${TODO#non} || exit 1
+
+# Local Variables:
+# sh-indentation: 8
+# sh-basic-offset: 8
+# End:

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     f302f425f4182a6f828fb36c421d46638fda03bf
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 01:14:21 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f302f425

scripts/bootstrap-prefix.sh: remove libgcc hack on RAP.

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9e3e4fd..79ebc62 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1438,7 +1438,7 @@ bootstrap_stage3() {
 	# linker, we can't since we want the compiler to pick it up.
 	# Therefore, inject some kludgy workaround, for deps like gmp that
 	# use c++
-	[[ ${CHOST} != *-darwin* ]] && export CXX="${CHOST}-g++ -lgcc_s"
+	[[ ${CHOST} != *-darwin* ]] && ! is-rap && export CXX="${CHOST}-g++ -lgcc_s"
 
 	# Clang unconditionally requires python, the eclasses are really not
 	# setup for a scenario where python doesn't live in the target

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     2b0664f542776c2eb10019515b97e5e3625b53d8
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 01:39:28 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 02:40:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2b0664f5

scripts/bootstrap-prefix.sh: rap helpers for profiles and portage tree.

 scripts/bootstrap-prefix.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a171e97..438e0be 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -7,6 +7,9 @@ trap 'exit 1' TERM KILL INT QUIT ABRT
 # some basic output functions
 eerror() { echo "!!! $*" 1>&2; }
 einfo() { echo "* $*"; }
+# RAP (libc) mode is triggered if the script is renamed to bootstrap-rap.sh.
+is-rap() { [[ ${BASH_SOURCE} = *rap.sh ]]; }
+rapx() { is-rap && echo $1 || echo $2; }
 
 # prefer gtar over tar
 [[ x$(type -t gtar) == "xfile" ]] \
@@ -235,6 +238,8 @@ bootstrap_setup() {
 				echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
 		} > "${ROOT}"/etc/portage/make.conf
 	fi
+
+	local linux=$(rapx linux-standalone linux)
 	
 	case ${CHOST} in
 		powerpc-apple-darwin7)
@@ -261,22 +266,22 @@ bootstrap_setup() {
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
 		i*86-pc-linux-gnu)
-			profile="prefix/linux/x86"
+			profile="prefix/${linux}/x86"
 			;;
 		x86_64-pc-linux-gnu)
-			profile="prefix/linux/amd64"
+			profile="prefix/${linux}/amd64"
 			;;
 		ia64-pc-linux-gnu)
-			profile="prefix/linux/ia64"
+			profile="prefix/${linux}/ia64"
 			;;
 		powerpc-unknown-linux-gnu)
-			profile="prefix/linux/ppc"
+			profile="prefix/${linux}/ppc"
 			;;
 		powerpc64-unknown-linux-gnu)
-			profile="prefix/linux/ppc64"
+			profile="prefix/${linux}/ppc64"
 			;;
 		armv7l-pc-linux-gnu)
-			profile="prefix/linux/arm"
+			profile="prefix/${linux}/arm"
 			;;
 		sparc-sun-solaris2.9)
 			profile="prefix/sunos/solaris/5.9/sparc"
@@ -408,6 +413,8 @@ do_tree() {
 }
 
 bootstrap_tree() {
+	# RAP uses the latest gentoo main repo snapshot to bootstrap.
+	is-rap && LATEST_TREE_YES=1
 	local PV="20160614"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
@@ -2405,9 +2412,10 @@ export PORTDIR=${PORTDIR:-"${ROOT}/usr/portage"}
 export DISTDIR=${DISTDIR:-"${PORTDIR}/distfiles"}
 PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/tmp/var/tmp}
 DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
-SNAPSHOT_URL=${SNAPSHOT_URL:-"http://rsync.prefix.bitzolder.nl/snapshots"}
 GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
 GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
+SNAPSHOT_HOST=$(rapx ${GENTOO_MIRRORS} http://rsync.prefix.bitzolder.nl)
+SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
 GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"
 
 export MAKE CONFIG_SHELL

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3bb409b3eba0c8d3c4dfc33e5066a7fb4e24339a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 07:09:35 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 07:09:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3bb409b3

scripts/bootstrap-prefix: only disable sandbox on RAP

 scripts/bootstrap-prefix.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e05c81a..22987e0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -232,8 +232,10 @@ bootstrap_setup() {
 			echo 'CXXFLAGS="${CFLAGS}"'
 			echo "MAKEOPTS=\"${MAKEOPTS}\""
 			echo "CONFIG_SHELL=\"${ROOT}/bin/bash\""
-			echo "# sandbox does not work well on Prefix, bug 490246"
-			echo 'FEATURES="-usersandbox -sandbox"'
+			if is-rap ; then
+				echo "# sandbox does not work well on Prefix, bug 490246"
+				echo 'FEATURES="-usersandbox -sandbox"'
+			fi
 			if [[ !is-rap && -n ${PREFIX_DISABLE_USR_SPLIT} ]] ; then
 				echo
 				echo "# This disables /usr-split, removing this will break"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     ee34021a129fc78c38b6d025aa31c78cb18a6264
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 01:16:20 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 01:26:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ee34021a

bootstrap-prefix.sh: warn if ROOT is defined by the host shell.

  reported by jben2.

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 22987e0..535441e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1635,6 +1635,7 @@ EOF
 		PERL_MM_OPT \
 		PKG_CONFIG_PATH \
 		PYTHONPATH \
+		ROOT \
 	; do
 		# starting on purpose a shell here iso ${!flag} because I want
 		# to know if the shell initialisation files trigger this

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     054a1688662d0e45fe7957f7bb1f908398e64d30
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 16:51:35 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 16:51:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=054a1688

bootstrap-prefix: run rehash after removing tmp again

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 535441e..42c01c4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2168,14 +2168,14 @@ EOF
 		exit 1
 	fi
 
-	hash -r  # tmp/* stuff is removed in stage3
-
 	if emerge -e system ; then
 		# Now, after 'emerge -e system', we can get rid of the temporary tools.
 		if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then
 			rm -Rf "${EPREFIX}"/tmp || return 1
 			mkdir -p "${EPREFIX}"/tmp || return 1
 		fi
+
+		hash -r  # tmp/* stuff is removed in stage3
 	else
 		# emerge -e system fail
 		cat << EOF

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     c81194a94820ab2edb8b16102416b7dbbec54c76
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 09:26:44 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 09:27:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c81194a9

stage3: use symlinked bash from stage2.

  link with absolute path, because bin/ could be symlinked to usr/bin/.

 scripts/bootstrap-prefix.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 42c01c4..43a401b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -552,7 +552,7 @@ bootstrap_portage() {
 	[[ -x ${ROOT}/tmp/bin/bash ]] || [[ ! -x ${ROOT}/tmp/usr/bin/bash ]] || ln -s ../usr/bin/bash "${ROOT}"/tmp/bin/bash || return 1
 	[[ -x ${ROOT}/tmp/bin/bash ]] || ln -s "${BASH}" "${ROOT}"/tmp/bin/bash || return 1
 	[[ -x ${ROOT}/tmp/bin/sh ]] || ln -s bash "${ROOT}"/tmp/bin/sh || return 1
-	[[ -x ${ROOT}/bin/bash ]] || ln -s ../tmp/bin/bash "${ROOT}"/bin/bash || return 1
+	[[ -x ${ROOT}/bin/bash ]] || ln -s "${ROOT}"{/tmp,}/bin/bash || return 1
 	[[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1
 	export PORTAGE_BASH="${ROOT}"/tmp/bin/bash
 
@@ -1430,10 +1430,6 @@ bootstrap_stage3() {
 		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	else
 		pkgs=(
-			$([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency
-			sys-libs/ncurses
-			sys-libs/readline
-			app-shells/bash
 			sys-apps/sed
 			app-arch/xz-utils
 			sys-apps/gentoo-functions

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     294c062bc8491a2def364ff41edaf70c3c06638f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 06:34:54 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 06:34:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=294c062b

bootstrap-prefix: bump snapshot, bug #585756

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 43a401b..e57cf03 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -453,7 +453,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20160614"
+	local PV="20160927"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a22f16970276d86ae529d74cff0156d76e9b33ee
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 10:06:07 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 10:06:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a22f1697

scripts/bootstrap-prefix: add support for macOS Sierra (10.12)

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e57cf03..de52c07 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -299,7 +299,7 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
-		x86_64-apple-darwin9|x86_64-apple-darwin1[012345])
+		x86_64-apple-darwin9|x86_64-apple-darwin1[0123456])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     9bbbce997334d091adfa85246f09a6c5aeb3beba
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 11:42:13 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 11:42:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9bbbce99

bootstrap_stage2: force python found for llvm-3.4

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index de52c07..f14202f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1317,6 +1317,7 @@ bootstrap_stage2() {
 	EXTRA_ECONF="--disable-bootstrap" \
 	GCC_MAKE_TARGET=all \
 	TPREFIX="${ROOT}" \
+	PYTHON_COMPAT_OVERRIDE=python2.7 \
 	emerge_pkgs --nodeps ${compiler_stage1} || return 1
 
 	# undo gmp cxx hack

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     3251e1a88f6e3b8d6ba2808b79646c26f44ab91c
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 11:59:10 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 11:59:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3251e1a8

scripts/bootstrap-prefix.sh: change rap repo to webrsync

 scripts/bootstrap-prefix.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f14202f..102523c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -261,9 +261,8 @@ bootstrap_setup() {
 
 			[rap]
 			location = ${ROOT}/usr/portage-stage
-			sync-type = git
-			sync-uri = https://anongit.gentoo.org/git/proj/android.git
-			auto-sync = no
+			sync-type = webrsync
+			sync-uri = http://dev.gentoo.org/~heroxbd/android-master.tar.bz2
 			EOF
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     770de33f3956ab1495c2b4555af184e6ce605ca4
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 08:37:32 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 08:37:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=770de33f

webrsync only work for the main repository.

Revert "scripts/bootstrap-prefix.sh: change rap repo to webrsync"

This reverts commit 3251e1a88f6e3b8d6ba2808b79646c26f44ab91c.

 scripts/bootstrap-prefix.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 102523c..f14202f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -261,8 +261,9 @@ bootstrap_setup() {
 
 			[rap]
 			location = ${ROOT}/usr/portage-stage
-			sync-type = webrsync
-			sync-uri = http://dev.gentoo.org/~heroxbd/android-master.tar.bz2
+			sync-type = git
+			sync-uri = https://anongit.gentoo.org/git/proj/android.git
+			auto-sync = no
 			EOF
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     31b5a3cff0d40e1ae26bd6fa763aeebab6c359bb
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 08:21:00 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 08:21:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=31b5a3cf

bootstrap-prefix.sh: elt-patches now depends on gentoo-functions.

 scripts/bootstrap-prefix.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 84efc84c57..335cb27cc4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -153,7 +153,7 @@ configure_cflags() {
 
 configure_toolchain() {
 	linker="sys-devel/binutils"
-	local gcc_deps="app-portage/elt-patches dev-libs/gmp dev-libs/mpfr dev-libs/mpc"
+	local gcc_deps="dev-libs/gmp dev-libs/mpfr dev-libs/mpc"
 	compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc"
 	compiler_stage1="${gcc_deps} sys-devel/gcc-config"
 	case ${CHOST} in
@@ -1457,6 +1457,7 @@ bootstrap_stage2() {
 
 	# Build a basic compiler and portage dependencies in $ROOT/tmp.
 	pkgs=(
+		sys-apps/gentoo-functions
 		app-portage/elt-patches
 		$([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency
 		$([[ ${CHOST} == *-cygwin* ]] && echo dev-libs/libiconv ) # bash dependency
@@ -1465,7 +1466,6 @@ bootstrap_stage2() {
 		app-shells/bash
 		app-arch/xz-utils
 		sys-apps/sed
-		sys-apps/gentoo-functions
 		sys-apps/baselayout-prefix
 		dev-libs/libffi
 		sys-devel/m4
@@ -1618,6 +1618,7 @@ bootstrap_stage3() {
 		pkgs=(
 			sys-apps/baselayout
 			sys-apps/gentoo-functions
+			app-portage/elt-patches
 			sys-kernel/linux-headers
 			sys-libs/glibc
 			sys-libs/zlib
@@ -1628,10 +1629,10 @@ bootstrap_stage3() {
 		grep -q 'apiversion=9999' "${ROOT}"/usr/bin/perl && rm "${ROOT}"/usr/bin/perl
 	else
 		pkgs=(
+			sys-apps/gentoo-functions
 			app-portage/elt-patches
 			app-arch/xz-utils
 			sys-apps/sed
-			sys-apps/gentoo-functions
 			sys-apps/baselayout-prefix
 			sys-devel/m4
 			sys-devel/flex

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     810aee40b6f2aeac54a80dec6f5dfbf8d435b60c
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 06:21:26 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 06:22:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=810aee40

bootstrap-prefix.sh: remove the definition of [gentoo] in repos.conf

  It is now handled correctly by the default repos.conf of portage.

 scripts/bootstrap-prefix.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 185ddcae77..e61fc9feef 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -320,14 +320,8 @@ bootstrap_setup() {
 	if is-rap && [[ ! -f ${ROOT}/etc/portage/repos.conf ]] ; then
 		cat  >"${ROOT}"/etc/portage/repos.conf <<-EOF
 			[DEFAULT]
-			main-repo = gentoo
 			eclass-overrides = rap
 
-			[gentoo]
-			location = ${ROOT}/usr/portage
-			sync-type = rsync
-			sync-uri = rsync://rsync.gentoo.org/gentoo-portage
-
 			[rap]
 			location = ${ROOT}/usr/portage-stage
 			sync-type = git

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     572743ec394caacf853d76682411f9628d4531d8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 06:54:33 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 06:54:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=572743ec

scripts/bootstrap-prefix: add required rhash dependency for cmake, thanks Shaun

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e61fc9feef..d5ed16e814 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -192,6 +192,7 @@ configure_toolchain() {
 	CXX=g++
 	llvm_deps="
 		app-arch/libarchive
+		app-crypt/rhash
 		dev-util/cmake
 		dev-util/ninja"
 	case ${CHOST} in

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     8b80d2fa2d1cf77cd3ee1d31daa1017912fc596b
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 05:34:18 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 05:36:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8b80d2fa

bootstrap-prefix.sh: require >=bash-4.2 to be available in stage2.

  Many essential ebuilds, like app-portage/elt-patches are at EAPI=6,
  which requires bash-4.2 to function.

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d5ed16e814..c300b5ac07 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1225,7 +1225,7 @@ bootstrap_stage1() {
 	[[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] || (bootstrap_patch) || return 1
 	[[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1
 	[[ $(awk --version < /dev/null 2>&1) == *GNU* ]] || bootstrap_gawk || return 1
-	[[ $(bash --version 2>&1) == "GNU bash, version 4."[123456789]* && ${CHOST} != *-aix* ]] \
+	[[ $(bash --version 2>&1) == "GNU bash, version 4."[23456789]* && ${CHOST} != *-aix* ]] \
 		|| [[ -x ${ROOT}/tmp/usr/bin/bash ]] \
 		|| (bootstrap_bash) || return 1
 	type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     17f80a052a482504fed60f1722e8e58e5782e784
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 14:16:52 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 14:16:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=17f80a05

bootstrap-prefix.sh: new USE 'build' of dev-util/pkgconfig

  'internal-glib' has been replace by 'build'
  >=dev-util/pkgconfig-0.29.2

  pending removal of USE internal-glib until the prefix overlay
  snapshot is bumped to have dev-util/pkgconfig-0.29.2.

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c300b5ac07..df7af9ac90 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1375,6 +1375,7 @@ do_emerge_pkgs() {
 			bootstrap
 			clang
 			internal-glib
+			build
 		)
 		myuse=" ${myuse[*]} "
 		local use

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     b82227e9968d42658fa52d3742e4a6b3d59e8ffd
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 11:50:55 2017 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 11:50:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b82227e9

bootstrap-prefix.sh (stage1 xz): disable-assembler

SuSE 11.1 does have GNU binutils-2.20, choking on crc32_x86.s.

 scripts/bootstrap-prefix.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index df7af9ac90..b290cc90d7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -757,6 +757,9 @@ bootstrap_gnu() {
 	# Gentoo Bug 400831, fails on Ubuntu with libssl-dev installed
 	[[ ${PN} == "wget" ]] && myconf="${myconf} --without-ssl"
 
+	# SuSE 11.1 has GNU binutils-2.20, choking on crc32_x86
+	[[ ${PN} == "xz" ]] && myconf="${myconf} --disable-assembler"
+
 	# we do not have pkg-config to find lib/libffi-*/include/ffi.h
 	[[ ${PN} == "libffi" ]] && 
 	sed -i -e '/includesdir =/s/=.*/= $(includedir)/' include/Makefile.in

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     86c70718a8531e139bf1401cf762932f82d10b87
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 09:36:35 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 09:36:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=86c70718

scripts/bootstrap-prefix: add profile support for macOS High Sierra

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b290cc90d7..7131ea7641 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -359,11 +359,11 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
-		i*86-apple-darwin1[0123])
+		i*86-apple-darwin1[01234567])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
-		x86_64-apple-darwin9|x86_64-apple-darwin1[0123456])
+		x86_64-apple-darwin9|x86_64-apple-darwin1[01234567])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     40e6757daf7239954f05212f633d72067f3031bf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 07:43:13 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 07:43:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=40e6757d

scripts/bootstrap-prefix: bump snapshot for bug #631952

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7131ea7641..e2570b1941 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -517,7 +517,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20170822"
+	local PV="20170924"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     450b234ef96da9f3d9c8f4c3f7d90181f06789d1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 06:37:04 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 06:37:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=450b234e

scripts/bootstrap-prefix: bump bootstrap tree, necessary for gcc-7 fixes

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e2570b1941..392e981212 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -517,7 +517,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20170924"
+	local PV="20171023"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3f0951e7ab075f29a3f65dbb348dd019086a8dbc
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  9 14:07:48 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Nov  9 14:07:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3f0951e7

bootstrap_tree: use existing snapshot

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 392e981212..c4a2b55f97 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -517,7 +517,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20171023"
+	local PV="20171108"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3e06838228291d6b658bc38ea1069646bacb340c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 12:35:41 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 12:35:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3e068382

scripts/bootstrap-prefix: bump snapshot for macOS High Sierra, bug #632500

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c4a2b55f97..c2bb5c1e26 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -517,7 +517,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20171108"
+	local PV="20171112"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5dcd55c9c1f1d474ef977c21e18759e6ac8e7857
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 14:31:54 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 14:31:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5dcd55c9

scripts/bootstrap-prefix: bootstrap coreutils 8.28 for High Sierra

 scripts/bootstrap-prefix.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c2bb5c1e26..f8eb310892 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1083,8 +1083,10 @@ bootstrap_grep() {
 bootstrap_coreutils() {
 	# 8.12 for FreeBSD 9.1, bug #415439
 	# 8.16 is the last version released as tar.gz
-	bootstrap_gnu coreutils 8.16 || bootstrap_gnu coreutils 8.17 || \
-	bootstrap_gnu coreutils 8.12 
+	# 8.18 is necessary for macOS High Sierra (darwin17) and converted
+	#      to tar.gz for this case
+	bootstrap_gnu coreutils 8.28 || bootstrap_gnu coreutils 8.16 || \
+	bootstrap_gnu coreutils 8.17 || bootstrap_gnu coreutils 8.12
 }
 
 bootstrap_tar() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     4233fe3f1bd46ad9b26b226f392d68db706e1be2
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 06:28:21 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 00:42:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4233fe3f

bootstrap-prefix.sh: get rid of the portage-stage overlay.

  We can now 100% stand on gentoo main repository.

 scripts/bootstrap-prefix.sh | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f8eb310892..c6f71bd8a6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -318,19 +318,6 @@ bootstrap_setup() {
 		} > "${ROOT}"/etc/portage/make.conf
 	fi
 
-	if is-rap && [[ ! -f ${ROOT}/etc/portage/repos.conf ]] ; then
-		cat  >"${ROOT}"/etc/portage/repos.conf <<-EOF
-			[DEFAULT]
-			eclass-overrides = rap
-
-			[rap]
-			location = ${ROOT}/usr/portage-stage
-			sync-type = git
-			sync-uri = https://anongit.gentoo.org/git/proj/android.git
-			auto-sync = no
-			EOF
-	fi
-
 	if is-rap ; then
 		[[ -f ${ROOT}/etc/passwd ]] || getent passwd > "${ROOT}"/etc/passwd || \
 			ln -sf {,"${ROOT}"}/etc/passwd
@@ -523,10 +510,6 @@ bootstrap_tree() {
 	else
 		do_tree http://dev.gentoo.org/~grobian/distfiles prefix-overlay-${PV}.tar.bz2
 	fi
-	if is-rap; then
-		PORTDIR="${ROOT}/usr/portage-stage" \
-		       do_tree http://dev.gentoo.org/~heroxbd android-master.tar.bz2
-	fi
 }
 
 bootstrap_startscript() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     b82bf408a5c5c648095b85ed43dc5af2bad0e5cf
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 06:29:57 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 00:42:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b82bf408

Revert "bootstrap-prefix.sh: new USE 'build' of dev-util/pkgconfig"

This reverts commit 17f80a052a482504fed60f1722e8e58e5782e784.

Reference: main repo commit 2b5220fd78fbfaff91e2.

 scripts/bootstrap-prefix.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c6f71bd8a6..510b23f924 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1363,7 +1363,6 @@ do_emerge_pkgs() {
 			bootstrap
 			clang
 			internal-glib
-			build
 		)
 		myuse=" ${myuse[*]} "
 		local use

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     0cd156717887780716319f191f44a64681c325d8
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 02:18:59 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 09:45:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0cd15671

bootstrap-prefix.sh: wget no-check-certificate before stage1 portage

  The host certificates could be outdated and does not contain Let's
  encrypt used by gentoo.

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 510b23f924..bf35b32b81 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -45,6 +45,7 @@ efetch() {
 			# curl, FreeBSD's fetch and ftp.
 			if [[ x$(type -t wget) == "xfile" ]] ; then
 				FETCH_COMMAND="wget"
+				[[ $(wget -h) == *"--no-check-certificate"* ]] && FETCH_COMMAND+=" --no-check-certificate"
 			elif [[ x$(type -t curl) == "xfile" ]] ; then
 				einfo "WARNING: curl doesn't fail when downloading fails, please check its output carefully!"
 				FETCH_COMMAND="curl -f -L -O"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     345944686caf4b029c869767ca40d38bee556c61
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 09:27:03 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 09:45:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=34594468

bootstrap-prefix.sh: fix CPPFLAGS for header directory in stage3.

  The CPPFLAGS is needed in stage3 before a working toolchain is
  built.  stage2 headers are not enough when e.g. the host headers are
  too old.

  '-isystem' is the correct choice because EPREFIX/usr/include is a
  system-header-like directory.  In rare cases, '-I' causes conflicts
  between bundled header and system header, like Bug 618488.

  After the stage3 toolchain is built, directories specified by
  CPPFLAGS and LDFLAGS are automatically handled and the variables
  should be removed.  Not removing them pollutes the build system of
  some sophisticated packages which hack CPPFLAGS or LD_LIBRARY_PATH,
  e.g. dev-libs/gmp-6.

Closes: https://bugs.gentoo.org/618488

 scripts/bootstrap-prefix.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bf35b32b81..f811cf6887 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1549,7 +1549,7 @@ bootstrap_stage3() {
 
 	configure_toolchain || return 1
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
-	is-rap || export CPPFLAGS="-I${ROOT}/usr/include"
+	export CPPFLAGS="-isystem ${ROOT}/usr/include"
 	export LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
 	unset CC CXX
 
@@ -1666,9 +1666,7 @@ bootstrap_stage3() {
 		rm -f "${ROOT}"/bin/sh
 		ln -s bash "${ROOT}"/bin/sh
 	fi
-	unset CONFIG_SHELL
-	unset MAKEINFO
-	unset CXX
+	unset CONFIG_SHELL MAKEINFO CXX CPPFLAGS LDFLAGS
 	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
 	# get a sane bash, overwriting tmp symlinks

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     5c449e3567541b3cc1a02ac28e87d3e8084a8d68
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 11:57:14 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 11:58:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5c449e35

bootstrap-prefix.sh: support bootstraping for aarch64.

 scripts/bootstrap-prefix.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1059b15c68..06227ad812 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -370,6 +370,9 @@ bootstrap_setup() {
 		powerpc64-unknown-linux-gnu)
 			profile="prefix/${linux}/ppc64${legacy}"
 			;;
+		aarch64-unknown-linux-gnu)
+			profile="prefix/${linux}/arm64${legacy}"
+			;;
 		armv7l-pc-linux-gnu)
 			profile="prefix/${linux}/arm${legacy}"
 			;;
@@ -2555,7 +2558,7 @@ if [[ -z ${CHOST} ]]; then
 					ppc*)
 						CHOST="`uname -m | sed -e 's/^ppc/powerpc/'`-unknown-linux-gnu"
 						;;
-					powerpc*)
+					powerpc*|aarch64*)
 						CHOST="`uname -m`-unknown-linux-gnu"
 						;;
 					*)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     cec70b7567a453252415eabfb959421cd0eda9ab
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 11:56:32 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 11:58:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cec70b75

bootstrap-prefix.sh: no need to make custom repos.conf.

  The portage default just works.

 scripts/bootstrap-prefix.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f811cf6887..1059b15c68 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -641,9 +641,7 @@ bootstrap_portage() {
 
 	[[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" "${ROOT}"/tmp/usr/portage
 
-	if is-rap; then
-		cp -f "${ROOT}"/etc/portage/repos.conf "${ROOT}"/tmp/usr/share/portage/config/repos.conf
-	elif [[ -s ${PORTDIR}/profiles/repo_name ]]; then
+	if [[ -s ${PORTDIR}/profiles/repo_name ]]; then
 		# sync portage's repos.conf with the tree being used
 		sed -i -e "s,gentoo_prefix,$(<"${PORTDIR}"/profiles/repo_name)," "${ROOT}"/tmp/usr/share/portage/config/repos.conf || return 1
 	fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     f05380dd9a7d090acb25ab97721d240dee039b53
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 04:26:39 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 04:26:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f05380dd

bootstrap-prefix.sh: fine tune USE flags by package.use

  We want dev-libs/gmp[-cxx] and sys-devel/gcc[cxx].  Environmental
  USE is not precise enough.

 scripts/bootstrap-prefix.sh | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3caa1aa5e1..1b15a7add2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -438,6 +438,28 @@ bootstrap_setup() {
 		ln -s "${fullprofile}" "${ROOT}"/etc/portage/make.profile
 		einfo "Your profile is set to ${fullprofile}."
 	fi
+
+	# Use package.use to disable in the portage tree to be shared between
+	# stage2 and stage3. The hack will be undone during tree sync in stage3.
+	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
+	# Most binary Linux distributions seem to fancy toolchains that
+	# do not do c++ support (need to install a separate package).
+	sys-libs/ncurses -cxx
+	sys-devel/binutils -cxx
+	EOF
+
+	# Strange enough, -cxx causes wrong libtool config on Cygwin,
+	# but we require a C++ compiler there anyway - so just use it.
+	[[ ${CHOST} == *-cygwin* ]] ||
+		cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
+	# gmp has cxx flag enabled by default. When dealing with a host
+	# compiler without cxx support this causes configure failure.
+	# In addition, The stage2 g++ is only for compiling stage3 compiler,
+	# because the host libstdc++.so runtime may be not compatible and
+	# stage2 libstdc++.so might conflict with that of stage3.  The
+	# trade-off is just not to use cxx.
+	dev-libs/gmp -cxx
+	EOF
 }
 
 do_tree() {
@@ -1412,27 +1434,15 @@ bootstrap_stage2() {
 		sys-devel/binutils-config
 	)
 
-	# Most binary Linux distributions seem to fancy toolchains that
-	# do not do c++ support (need to install a separate package).
-	USE="${USE} -cxx" \
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	
 	# Build a linker and compiler that live in ${ROOT}/tmp, but
 	# produce binaries in ${ROOT}. Debian multiarch supported by RAP
 	# needs ld to support sysroot.
-	USE="${USE} -cxx" \
 	TPREFIX="${ROOT}" \
 	EXTRA_ECONF=$(rapx --with-sysroot=/) \
 	emerge_pkgs --nodeps ${linker} || return 1
 
-	# gmp has cxx flag enabled by default. When dealing with a host
-	# compiler without cxx support this causes configure failure. Use
-	# package.use to disable in the temporary prefix.  
-	# Strange enough, -cxx causes wrong libtool config on Cygwin,
-	# but we require a C++ compiler there anyway - so just use it.
-	[[ ${CHOST} == *-cygwin* ]] ||
-	echo "dev-libs/gmp -cxx" >> "${ROOT}"/tmp/etc/portage/package.use
-
 	# Old versions of gcc has been masked.  We need gcc-4.7 to bootstrap
 	# on systems without a c++ compiler.
 	echo '<sys-devel/gcc-4.8' >> "${ROOT}"/tmp/etc/portage/package.unmask
@@ -1448,9 +1458,6 @@ bootstrap_stage2() {
 	PYTHON_COMPAT_OVERRIDE=python2.7 \
 	emerge_pkgs --nodeps ${compiler_stage1} || return 1
 
-	# undo gmp cxx hack
-	rm -f "${ROOT}"/tmp/etc/portage/package.use
-	
 	if [[ ${CHOST} == *darwin* ]] ; then
 		# we use Clang as our toolchain compiler, so we need to make
 		# sure we actually use it

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     35e720f2898f90e5741698ec349fd03a84a67b29
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 04:24:24 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 04:24:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=35e720f2

bootstrap-prefix.sh: kiss goodbye IRIX, HPUX and BSD.

  You have been served us well.  Lead a happy life after retire.
  The corresponding profiles have already been removed.

 scripts/bootstrap-prefix.sh | 130 +-------------------------------------------
 1 file changed, 2 insertions(+), 128 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 06227ad812..e9542d3ed6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -114,9 +114,6 @@ configure_cflags() {
 		*-solaris* | *-irix*)
 			export LDFLAGS="-L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib"
 			;;
-		*-hp-hpux*)
-			export LDFLAGS="-L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib -L/usr/local/lib -R/usr/local/lib"
-			;;
 		*-*-aix*)
 			# The bootstrap compiler unlikely has runtime linking
 			# enabled already, but elibtoolize switches to the
@@ -409,9 +406,6 @@ bootstrap_setup() {
 		powerpc-ibm-aix*)
 			profile="prefix/aix/${CHOST#powerpc-ibm-aix}/ppc"
 			;;
-		mips-sgi-irix*)
-			profile="prefix/irix/${CHOST#mips-sgi-irix}/mips"
-			;;
 		i586-pc-interix*)
 			profile="prefix/windows/interix/${CHOST#i586-pc-interix}/x86"
 			;;
@@ -424,33 +418,6 @@ bootstrap_setup() {
 		x86_64-pc-cygwin*)
 			profile="prefix/windows/cygwin/x64"
 			;;
-		hppa64*-hp-hpux11*)
-			profile="prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa64"
-			;;
-		hppa2.0*-hp-hpux11*)
-			profile="prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa2.0"
-			;;
-		ia64-hp-hpux11*)
-			profile="prefix/hpux/B.11${CHOST#ia64-hp-hpux11}/ia64"
-			;;
-		i386-pc-freebsd*)
-			profile="prefix/bsd/freebsd/${CHOST#i386-pc-freebsd}/x86"
-			;;
-		x86_64-pc-freebsd*)
-			profile="prefix/bsd/freebsd/${CHOST#x86_64-pc-freebsd}/x64"
-			;;
-		i386-pc-netbsd*)
-			profile="prefix/bsd/netbsd/${CHOST#i386-pc-netbsdelf}/x86"
-			;;
-		powerpc-unknown-openbsd*)
-			profile="prefix/bsd/openbsd/${CHOST#powerpc-unknown-openbsd}/ppc"
-			;;
-		i386-pc-openbsd*)
-			profile="prefix/bsd/openbsd/${CHOST#i386-pc-openbsd}/x86"
-			;;
-		x86_64-pc-openbsd*)
-			profile="prefix/bsd/openbsd/${CHOST#x86_64-pc-openbsd}/x64"
-			;;
 		*)	
 			eerror "UNKNOWN ARCH: You need to set up a make.profile symlink to a"
 			eerror "profile in ${PORTDIR} for your CHOST ${CHOST}"
@@ -720,9 +687,6 @@ bootstrap_gnu() {
 	[[ ${PN},${CHOST} == bash,*-aix* ]] &&
 	export CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-DUSE_MKTEMP"
 
-	# NetBSD has strange openssl headers, which make wget fail.
-	[[ $CHOST == *-netbsd* ]] && myconf="${myconf} --disable-ntlm"
-
 	# Darwin9 in particular doesn't compile when using system readline,
 	# but we don't need any groovy input at all, so just disable it
 	[[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline"
@@ -734,11 +698,6 @@ bootstrap_gnu() {
 	[[ ${PN} == "coreutils" ]] && \
 		myconf="${myconf} --disable-acl --without-gmp"
 
-	if [[ ${PN} == "tar" && ${CHOST} == *-hpux* ]] ; then
-		# Fix a compilation error due to a missing definition
-		export CPPFLAGS="${CPPFLAGS} -DCHAR_BIT=8"
-	fi
-
 	# Gentoo Bug 400831, fails on Ubuntu with libssl-dev installed
 	[[ ${PN} == "wget" ]] && myconf="${myconf} --without-ssl"
 
@@ -887,9 +846,6 @@ EOP
 			# And ctypes dynamically loads "libpythonX.Y.dll" anyway.
 			myconf="${myconf} --enable-shared"
 		;;
-		*-openbsd*)
-			CFLAGS="${CFLAGS} -D_BSD_SOURCE=1"
-		;;
 		*-linux*)
 			# Bug 382263: make sure Python will know about the libdir in use for
 			# the current arch
@@ -908,7 +864,7 @@ EOP
 	export LDFLAGS="${CFLAGS} -L${ROOT}/tmp/usr/lib -L${ROOT}/tmp/usr/lib64"
 	# set correct flags for runtime for ELF platforms
 	case $CHOST in
-		*-*bsd*|*-linux*)
+		*-linux*)
 			# GNU ld
 			export LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}"
 		;;
@@ -1066,12 +1022,11 @@ bootstrap_grep() {
 }
 
 bootstrap_coreutils() {
-	# 8.12 for FreeBSD 9.1, bug #415439
 	# 8.16 is the last version released as tar.gz
 	# 8.18 is necessary for macOS High Sierra (darwin17) and converted
 	#      to tar.gz for this case
 	bootstrap_gnu coreutils 8.28 || bootstrap_gnu coreutils 8.16 || \
-	bootstrap_gnu coreutils 8.17 || bootstrap_gnu coreutils 8.12
+	bootstrap_gnu coreutils 8.17
 }
 
 bootstrap_tar() {
@@ -2127,11 +2082,9 @@ EOF
 	case "${CHOST}" in
 		*-cygwin*)     ncpu=$(cmd /D /Q /C 'echo %NUMBER_OF_PROCESSORS%' | tr -d "\\r") ;;
 		*-darwin*)     ncpu=$(/usr/sbin/sysctl -n hw.ncpu)                 ;;
-		*-freebsd*)    ncpu=$(/sbin/sysctl -n hw.ncpu)                     ;;
 		*-solaris*)    ncpu=$(/usr/sbin/psrinfo | wc -l)                   ;;
 		*-linux-gnu*)  ncpu=$(cat /proc/cpuinfo | grep processor | wc -l)  ;;
 		*-aix*)        ncpu=$(/usr/sbin/bindprocessor -q | cut -d: -f2 | wc -w) ;;
-		*-hpux*)       ncpu=$(/sbin/ioscan -kC processor | grep -c processor) ;;
 		*)             ncpu=1                                              ;;
 	esac
 	# get rid of excess spaces (at least Solaris wc does)
@@ -2591,9 +2544,6 @@ if [[ -z ${CHOST} ]]; then
 				# guessing here, instead of what IBM uses itself.
 				CHOST="`/usr/bin/uname -p`-ibm-aix`oslevel`"
 				;;
-			IRIX|IRIX64)
-				CHOST="mips-sgi-irix`uname -r`"
-				;;
 			Interix)
 				case `uname -m` in
 					x86) CHOST="i586-pc-interix`uname -r`" ;;
@@ -2605,82 +2555,6 @@ if [[ -z ${CHOST} ]]; then
 			CYGWIN*)
 				CHOST="`uname -m`-pc-cygwin"
 				;;
-			HP-UX)
-				case `uname -m` in
-				ia64) HP_ARCH=ia64 ;;
-				9000/[678][0-9][0-9])
-					if [ ! -x /usr/bin/getconf ]; then
-						eerror "Need /usr/bin/getconf to determine cpu"
-						exit 1
-					fi
-					# from config.guess
-					sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-					sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-					case "${sc_cpu_version}" in
-					523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-					528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-					532)                      # CPU_PA_RISC2_0
-						case "${sc_kernel_bits}" in
-						32) HP_ARCH="hppa2.0n" ;;
-						64) HP_ARCH="hppa2.0w" ;;
-						'') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-						esac ;;
-					esac
-					;;
-				esac
-				uname_r=`uname -r`
-				if [ -z "${HP_ARCH}" ]; then
-					error "Cannot determine cpu/kernel type"
-					exit ;
-				fi
-				CHOST="${HP_ARCH}-hp-hpux${uname_r#B.}"
-				unset HP_ARCH uname_r
-				;;
-			FreeBSD)
-				case `uname -p` in
-					i386)
-						CHOST="i386-pc-freebsd`uname -r | sed 's|-.*$||'`"
-					;;
-					amd64)
-						CHOST="x86_64-pc-freebsd`uname -r | sed 's|-.*$||'`"
-					;;
-					sparc64)
-						CHOST="sparc64-unknown-freebsd`uname -r | sed 's|-.*$||'`"
-					;;
-					*)
-						eerror "Sorry, don't know about FreeBSD on `uname -p` yet"
-						exit 1
-					;;
-				esac
-				;;
-			NetBSD)
-				case `uname -p` in
-					i386)
-						CHOST="`uname -p`-pc-netbsdelf`uname -r`"
-					;;
-					*)
-						eerror "Sorry, don't know about NetBSD on `uname -p` yet"
-						exit 1
-					;;
-				esac
-				;;
-			OpenBSD)
-				case `uname -m` in
-					macppc)
-						CHOST="powerpc-unknown-openbsd`uname -r`"
-					;;
-					i386)
-						CHOST="i386-pc-openbsd`uname -r`"
-					;;
-					amd64)
-						CHOST="x86_64-pc-openbsd`uname -r`"
-					;;
-					*)
-						eerror "Sorry, don't know about OpenBSD on `uname -m` yet"
-						exit 1
-					;;
-				esac
-				;;
 			*)
 				eerror "Nothing known about platform `uname -s`."
 				eerror "Please set CHOST appropriately for your system"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     07e0e24d59ed46eb87cbfa725ef354110326521c
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 04:25:54 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 04:25:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=07e0e24d

bootstrap-prefix.sh: use tabs for emacs.

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e9542d3ed6..3caa1aa5e1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2694,4 +2694,5 @@ bootstrap_${TODO#non} || exit 1
 # Local Variables:
 # sh-indentation: 8
 # sh-basic-offset: 8
+# indent-tabs-mode: t
 # End:

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     c79d9272b631eadd79b5e81b0f3aef887d30eb63
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 08:03:13 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 08:04:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c79d9272

bootstrap-prefix.sh: enable RAP on any linux-based installations.

  This can be disabled by setting envvar PREFIX_DISABLE_RAP=yes.

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1b15a7add2..5c7ec7bd45 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -7,8 +7,8 @@ trap 'exit 1' TERM KILL INT QUIT ABRT
 # some basic output functions
 eerror() { echo "!!! $*" 1>&2; }
 einfo() { echo "* $*"; }
-# RAP (libc) mode is triggered if the script is renamed to bootstrap-rap.sh.
-is-rap() { [[ ${BASH_SOURCE} = *rap.sh ]]; }
+# RAP (libc) mode is triggered on Linux kernel and glibc.
+is-rap() { [[ ${PREFIX_DISABLE_RAP} != "yes" && ${CHOST} = *linux-gnu* ]]; }
 rapx() { is-rap && echo $1 || echo $2; }
 
 # prefer gtar over tar

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     dae1cff11a36860ac0ddd1ae18cd02daec894c8a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 16:26:54 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 16:26:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dae1cff1

scripts/bootstrap-prefix.sh: change Darwin bootstrap to use clang5

changes by Michael Weiser

Bug: https://bugs.gentoo.org/642656

 scripts/bootstrap-prefix.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5c7ec7bd45..6b928c2f83 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -178,14 +178,6 @@ configure_toolchain() {
 	  )
 	esac
 
-	# unfortunately, gmp needs c++, thus libcxx, so have to drag
-	# it in early (gmp is necessary for >3.5)
-	local cdep="3.5.9999"
-	local libcxx="
-		<sys-libs/libcxx-headers-${cdep}
-		<sys-libs/libcxxabi-${cdep}
-		<sys-libs/libcxx-${cdep}"
-
 	CC=gcc
 	CXX=g++
 	llvm_deps="
@@ -219,7 +211,8 @@ configure_toolchain() {
 								${llvm_deps}
 								sys-devel/llvm
 								sys-devel/clang
-								${libcxx}"
+								sys-libs/libcxxabi
+								sys-libs/libcxx"
 							;;
 					esac
 					CC=clang
@@ -249,12 +242,17 @@ configure_toolchain() {
 			if [[ ${mycc} == gcc ]] ; then
 				# The deps for 3.6+ are too high (cmake, ninja, python) so
 				# we have to install this with an intermediate
+				# unfortunately, gmp needs c++, thus libcxx, so have to drag
+				# it in early (gmp is necessary for >3.5)
 				# we always have to bootstrap with 3.4 for else we'd need
 				# libcxx, which only compiles with clang
+				local cdep="3.5.9999"
 				compiler_stage1+="
 					dev-libs/libffi
 					<sys-devel/llvm-3.5
-					${libcxx}
+					<sys-libs/libcxx-headers-${cdep}
+					<sys-libs/libcxxabi-${cdep}
+					<sys-libs/libcxx-${cdep}
 					<sys-devel/llvm-${cdep}
 					<sys-devel/clang-${cdep}"
 			fi
@@ -263,7 +261,8 @@ configure_toolchain() {
 				sys-libs/csu
 				dev-libs/libffi
 				${llvm_deps}
-				${libcxx}
+				sys-libs/libcxxabi
+				sys-libs/libcxx
 				sys-devel/llvm
 				sys-devel/clang"
 			;;
@@ -1453,6 +1452,7 @@ bootstrap_stage2() {
 
 	BOOTSTRAP_RAP_STAGE2=yes \
 	EXTRA_ECONF="--disable-bootstrap" \
+	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 	GCC_MAKE_TARGET=all \
 	TPREFIX="${ROOT}" \
 	PYTHON_COMPAT_OVERRIDE=python2.7 \
@@ -1520,7 +1520,7 @@ bootstrap_stage3() {
 		# stage3 tools should be used first.
 		# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
 		# needed with host portage.
-		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{,usr/}{s,}bin | sed "s, ,:${ROOT},g") \
+		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{,usr/}{,lib/llvm/5/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
 		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
@@ -1604,6 +1604,7 @@ bootstrap_stage3() {
 	RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
 	# try to get ourself out of the mudd, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \
+	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 	LDFLAGS="${LDFLAGS} $(rapx -Wl,--dynamic-linker=${RAP_DLINKER})" \
 	PYTHON_COMPAT_OVERRIDE=python2.7 \
 	emerge_pkgs --nodeps ${compiler} || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     bd802a20f3c8d250fd85ed66272df93583edde2a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  4 09:46:00 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 09:46:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bd802a20

scripts/bootstrap-prefix: update snapshots

Bug: https://bugs.gentoo.org/642656
Bug: https://bugs.gentoo.org/618396
Bug: https://bugs.gentoo.org/632500
Bug: https://bugs.gentoo.org/638816

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6b928c2f83..e262ffba3d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -496,7 +496,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20171112"
+	local PV="20180103"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -568,8 +568,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.8"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.8"
+	STABLE_PV="2.3.18"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.18"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e5c8da07a43b0a3af9994ceda31113ccb842db8e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 11:23:53 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 11:23:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e5c8da07

scripts/bootstrap-prefix: don't rely on bash-4.2 features

 scripts/bootstrap-prefix.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e262ffba3d..78c62ea314 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1181,8 +1181,9 @@ bootstrap_stage1() {
 	[[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null || (bootstrap_wget) || return 1
 	[[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1
 	[[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1
-	[[ $(bison --version 2>&1) =~ GNU" "Bison") "(2.[3-7]|[3-9]) ]] \
-		|| [[ -x ${ROOT}/tmp/usr/bin/bison ]] \
+	[[ -x ${ROOT}/tmp/usr/bin/bison ]] \
+		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
+		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
 		|| (bootstrap_bison) || return 1
 	[[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \
 		|| (bootstrap_coreutils) || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d54d253614e3f1c5baf3d81370ee32f081134b77
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 14:27:06 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 14:27:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d54d2536

scripts/bootstrap-prefix: have bootstrap_make install gmake symlink

If we set MAKE=gmake before, ensure that we use the just compiled make
by providing a gmake symlink.

 scripts/bootstrap-prefix.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 78c62ea314..dbce4d4256 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1057,6 +1057,10 @@ bootstrap_tar() {
 bootstrap_make() {
 	MAKEOPTS= # no GNU make yet
 	bootstrap_gnu make 3.82
+	if [[ ${MAKE} == gmake ]] ; then
+		# make make available as gmake
+		( cd ${ROOT}/tmp/usr/bin && ln -s make gmake )
+	fi
 }
 
 bootstrap_patch() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a3761848e8af2c52171b485383a6f8f1e0323b47
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 15:21:59 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 15:21:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a3761848

scripts/bootstrap-prefix: run bash check under LANG=C, bug #642678

At least in German locales, words like version are capitalised.

Closes: https://bugs.gentoo.org/642678

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index dbce4d4256..88f7dbcd1f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1196,7 +1196,7 @@ bootstrap_stage1() {
 	[[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] || (bootstrap_patch) || return 1
 	[[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1
 	[[ $(awk --version < /dev/null 2>&1) == *GNU* ]] || bootstrap_gawk || return 1
-	[[ $(bash --version 2>&1) == "GNU bash, version 4."[23456789]* && ${CHOST} != *-aix* ]] \
+	[[ $(LANG=C bash --version 2>&1) == "GNU bash, version 4."[23456789]* && ${CHOST} != *-aix* ]] \
 		|| [[ -x ${ROOT}/tmp/usr/bin/bash ]] \
 		|| (bootstrap_bash) || return 1
 	type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     24468235c3e00c94ff0ae08b6e229f98cfa23a02
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 07:13:29 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 07:52:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=24468235

scripts/bootstrap-prefix.sh: do not shortcut when EPREFIX/tmp exists.

  Do not put profiles into overlay.

 scripts/bootstrap-prefix.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 88f7dbcd1f..d38790b1b8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -427,12 +427,6 @@ bootstrap_setup() {
 	profile=${PROFILE_BASE:-prefix}/${profile#prefix/}${PROFILE_VARIANT:+/${PROFILE_VARIANT}}
 	if [[ -n ${profile} && ! -e ${ROOT}/etc/portage/make.profile ]] ; then
 		local fullprofile="${PORTDIR}/profiles/${profile}"
-		for base in ${PORTDIR_OVERLAY} ; do
-			if [[ -e ${base}/profiles/${profile}/parent ]] ; then
-				fullprofile="${base}/profiles/${profile}"
-				break
-			fi
-		done
 		
 		ln -s "${fullprofile}" "${ROOT}"/etc/portage/make.profile
 		einfo "Your profile is set to ${fullprofile}."
@@ -1138,10 +1132,11 @@ bootstrap_bzip2() {
 bootstrap_stage_host_gentoo() {
 	if [[ ! -L ${ROOT}/tmp ]] ; then
 		if [[ -e ${ROOT}/tmp ]] ; then
-			echo "${ROOT}/tmp should be a symlink to ${HOST_GENTOO_EROOT}"
-			return 1
+			einfo "${ROOT}/tmp exists and is not a symlink to ${HOST_GENTOO_EROOT}"
+			einfo "Let's ignore the shortcut and continue."
+		else
+			ln -s "${HOST_GENTOO_EROOT}" "${ROOT}"/tmp
 		fi
-		ln -s "${HOST_GENTOO_EROOT}" "${ROOT}"/tmp
 	fi
 
 	# checks itself if things need to be done still
@@ -2232,7 +2227,7 @@ EOF
 
 	# Figure out if we are bootstrapping from an existing Gentoo
 	# It can be forced by setting HOST_GENTOO_EROOT manually
-	local t_GENTOO_EROOT=$(/usr/bin/portageq envvar EROOT 2> /dev/null)
+	local t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> /dev/null)
 	if [[ ! -d ${HOST_GENTOO_EROOT} ]] && [[ -d ${t_GENTOO_EROOT} ]]; then
 		cat <<EOF
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     eac65b0b4e1fb7fa67e1b3d3008fbc308edc9b06
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 07:31:47 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 07:52:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=eac65b0b

scripts/bootstrap-prefix.sh: require GNU Awk 4.

  GNU Awk 3 does not switch on --non-decimal-data by default.

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f64409e89e..f475083486 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1190,7 +1190,7 @@ bootstrap_stage1() {
 	[[ $(tar --version 2>&1) == *GNU* ]] || (bootstrap_tar) || return 1
 	[[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] || (bootstrap_patch) || return 1
 	[[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1
-	[[ $(awk --version < /dev/null 2>&1) == *GNU* ]] || bootstrap_gawk || return 1
+	[[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] || bootstrap_gawk || return 1
 	[[ $(LANG=C bash --version 2>&1) == "GNU bash, version 4."[23456789]* && ${CHOST} != *-aix* ]] \
 		|| [[ -x ${ROOT}/tmp/usr/bin/bash ]] \
 		|| (bootstrap_bash) || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     2b54c4011ab80275208b8859a1865a967a3782e6
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 07:29:58 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 07:52:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2b54c401

scripts/bootstrap-prefix.sh: remove TPREFIX logic.

  stage2 linker should search for host libraries by default.

 scripts/bootstrap-prefix.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d38790b1b8..f64409e89e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1412,6 +1412,12 @@ bootstrap_stage2() {
 	# stage and rather have it continue instead of abort the build
 	export MAKEINFO="echo makeinfo GNU texinfo 4.13"
 
+	# Disable RAP directory hacks of binutils and gcc.  If libc.so
+	# linker script provides no hint of ld-linux*.so*, ld should
+	# look into its default library path.  Prefix library pathes
+	# are taken care of by LDFLAGS in configure_cflags().
+	export BOOTSTRAP_RAP_STAGE2=yes
+
 	# Build a basic compiler and portage dependencies in $ROOT/tmp.
 	pkgs=(
 		sys-apps/gentoo-functions
@@ -1435,10 +1441,7 @@ bootstrap_stage2() {
 
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	
-	# Build a linker and compiler that live in ${ROOT}/tmp, but
-	# produce binaries in ${ROOT}. Debian multiarch supported by RAP
-	# needs ld to support sysroot.
-	TPREFIX="${ROOT}" \
+	# Debian multiarch supported by RAP needs ld to support sysroot.
 	EXTRA_ECONF=$(rapx --with-sysroot=/) \
 	emerge_pkgs --nodeps ${linker} || return 1
 
@@ -1450,11 +1453,11 @@ bootstrap_stage2() {
 	# unless we only build the buildtool, bug #603012
 	echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
 
-	BOOTSTRAP_RAP_STAGE2=yes \
-	EXTRA_ECONF="--disable-bootstrap" \
-	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
+	# <glibc-2.5 does not understand .gnu.hash, use
+	# --hash-style=both to produce also sysv hash.
+	EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both)" \
+        MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \		   
 	GCC_MAKE_TARGET=all \
-	TPREFIX="${ROOT}" \
 	PYTHON_COMPAT_OVERRIDE=python2.7 \
 	emerge_pkgs --nodeps ${compiler_stage1} || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     82c620cc013e6e4f7953745de1372bf8b350ee06
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 14:12:15 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 14:12:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=82c620cc

scripts/bootstrap-prefix: add some fixes for powerpc-apple-darwin9

These fixes (with in tree fixes) allow to advance to stage3 with
llvm-3.4.2, libcxx-3.5.1, cmake and ninja installed.

 scripts/bootstrap-prefix.sh | 65 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 14 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f475083486..02c7e45148 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -249,11 +249,10 @@ configure_toolchain() {
 				local cdep="3.5.9999"
 				compiler_stage1+="
 					dev-libs/libffi
-					<sys-devel/llvm-3.5
+					<sys-devel/llvm-${cdep}
 					<sys-libs/libcxx-headers-${cdep}
 					<sys-libs/libcxxabi-${cdep}
 					<sys-libs/libcxx-${cdep}
-					<sys-devel/llvm-${cdep}
 					<sys-devel/clang-${cdep}"
 			fi
 
@@ -1361,6 +1360,10 @@ do_emerge_pkgs() {
 		echo "USE=${myuse[*]} PKG=${pkg}"
 		(
 			unset CFLAGS CXXFLAGS
+			[[ -n ${OVERRIDE_CFLAGS} ]] \
+				&& export CFLAGS=${OVERRIDE_CFLAGS}
+			[[ -n ${OVERRIDE_CXXFLAGS} ]] \
+				&& export CXXFLAGS=${OVERRIDE_CXXFLAGS}
 			PORTAGE_CONFIGROOT="${EPREFIX}" \
 			PORTAGE_SYNC_STALE=0 \
 			FEATURES="-news ${FEATURES}" \
@@ -1453,13 +1456,24 @@ bootstrap_stage2() {
 	# unless we only build the buildtool, bug #603012
 	echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
 
-	# <glibc-2.5 does not understand .gnu.hash, use
-	# --hash-style=both to produce also sysv hash.
-	EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both)" \
-        MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \		   
-	GCC_MAKE_TARGET=all \
-	PYTHON_COMPAT_OVERRIDE=python2.7 \
-	emerge_pkgs --nodeps ${compiler_stage1} || return 1
+	for pkg in ${compiler_stage1} ; do
+		# <glibc-2.5 does not understand .gnu.hash, use
+		# --hash-style=both to produce also sysv hash.
+		EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both)" \
+		MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
+		GCC_MAKE_TARGET=all \
+		TPREFIX="${ROOT}" \
+		PYTHON_COMPAT_OVERRIDE=python2.7 \
+		emerge_pkgs --nodeps ${pkg} || return 1
+
+		if [[ "${pkg}" == *sys-devel/llvm* || ${pkg} == *sys-devel/clang* ]] ;
+		then
+			# we need llvm/clang ASAP for libcxx* doesn't build
+			# without C++11
+			[[ -x ${ROOT}/tmp/usr/bin/clang   ]] && CC=clang
+			[[ -x ${ROOT}/tmp/usr/bin/clang++ ]] && CXX=clang++
+		fi
+	done
 
 	if [[ ${CHOST} == *darwin* ]] ; then
 		# we use Clang as our toolchain compiler, so we need to make
@@ -1604,6 +1618,19 @@ bootstrap_stage3() {
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
 
+	# llvm-3.5 doesn't find c++11 headers/lib by default, make it so
+	if [[ ${CHOST} == *-darwin9 ]] ; then
+		export OVERRIDE_CXXFLAGS="-I${ROOT}/tmp/usr/include/c++/v1 -fPIC"
+		# -fPIC is here because we need it, but the toolchain doesn't
+		# default to it (like for x86_64)
+		export OVERRIDE_CFLAGS="-fPIC"
+		# replace GCC's libstdc++ with libcxx (super hack!)
+		( cd "${ROOT}"/tmp/usr/lib/gcc/${CHOST}/4.2.1 \
+			&& ! test -e libstdc++.6.0.9.dylib-gcc \
+			&& mv libstdc++.6.0.9.dylib{,-gcc} \
+			&& ln -s ../../../libc++.1.dylib libstdc++.6.0.9.dylib )
+	fi
+
 	RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
 	# try to get ourself out of the mudd, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \
@@ -2085,7 +2112,15 @@ continue.  Please execute:
   xcode-select -s /Library/Developer/CommandLineTools
 and try running me again.
 EOF
-			exit 1
+			if ! xcode-select -p > /dev/null && [[ ${CHOST} == powerpc* ]]; then
+				# ancient Xcode (3.0/3.1)
+				cat << EOF
+
+Ok, this is an old system, let's just try and see what happens.
+EOF
+			else
+				exit 1
+			fi
 		fi
 	fi
 	echo
@@ -2394,10 +2429,12 @@ EOF
 	# deal with the bash-constructs we use in stage3 and onwards
 	hash -r
 
-	if ! [[ -x ${EPREFIX}/usr/bin/gcc \
-		|| -x ${EPREFIX}/usr/bin/clang \
-		|| -x ${EPREFIX}/tmp/usr/bin/gcc \
-		|| -x ${EPREFIX}/tmp/usr/bin/clang ]] \
+	# stage 2 on Darwin gets llvm/clang, so we must not get confused
+	# when we find gcc there (it's needed to bootstrap llvm)
+	local compiler=gcc
+	[[ ${CHOST} == *-darwin* ]] && compiler=clang
+	if ! [[ -x ${EPREFIX}/usr/bin/${compiler} \
+		|| -x ${EPREFIX}/tmp/usr/bin/${compiler} ]] \
 		&& ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2_log ; then
 		# stage 2 fail
 		cat << EOF

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8d5da8b108eb27a66f659c509a07bb3aab1839a6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 07:15:34 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 07:15:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8d5da8b1

scripts/bootstrap-prefix: also add rpath entries for special libdir

without this, at least on sparcv9 solaris 10 python won't start because it
can't find 64-bit libgcc_s.1.so

 scripts/bootstrap-prefix.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 02c7e45148..d5cad4d148 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -880,11 +880,13 @@ EOP
 	case $CHOST in
 		*-linux*)
 			# GNU ld
-			export LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}"
+			LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}"
+			LDFLAGS="${LDFLAGS} -Wl,-rpath,${libdir#-L}"
 		;;
 		*-solaris*)
 			# Sun ld
-			export LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/usr/lib ${libdir}"
+			LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/usr/lib ${libdir}"
+			LDFLAGS="${LDFLAGS} -R${libdir#-L}"
 		;;
 	esac
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     7f2ceb06ae9a0a8688fabfd4f41f3f3c2b1fe893
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 11:00:18 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 11:36:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7f2ceb06

bootstrap-prefix.sh: require bash 4.2.

  Direct the users to bootstrap bash 4.2 first.

 scripts/bootstrap-bash.sh   | 22 ++++++++++------------
 scripts/bootstrap-prefix.sh | 11 +++++++++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/scripts/bootstrap-bash.sh b/scripts/bootstrap-bash.sh
index a891cc16ae..be0b36d831 100755
--- a/scripts/bootstrap-bash.sh
+++ b/scripts/bootstrap-bash.sh
@@ -1,14 +1,12 @@
 #!/bin/sh
-# Copyright 2006-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 2006-2018 Gentoo Foundation; Distributed under the GPL v2
 
-# *BSD bash installer
+# bash installer
 #
-# FreeBSD and OpenBSD come with some POSIX (?) /bin/sh which doesn't eat
-# most of the stuff in the bootstrap-prefix script, among which the most
-# important part: dynamic function calling.  So, we need to bootstrap
-# bash outside the bootstrap script, which is the purpose of this
-# script.
-# This script also runs on Interix
+#  POSIX (?) /bin/sh which doesn't eat most of the stuff in the
+# bootstrap-prefix script, among which the most important part:
+# dynamic function calling.  So, we need to bootstrap bash outside the
+# bootstrap script, which is the purpose of this script.
 
 [ -z "$1" ] && exit -1
 
@@ -19,10 +17,10 @@ cd bash-build
 
 GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org/distfiles"}
 
-ftp "${GENTOO_MIRRORS}/bash-4.1.tar.gz"
-gzip -d bash-4.1.tar.gz
-tar -xf bash-4.1.tar
-cd bash-4.1
+ftp "${GENTOO_MIRRORS}/bash-4.2.tar.gz"
+gzip -d bash-4.2.tar.gz
+tar -xf bash-4.2.tar
+cd bash-4.2
 
 ./configure --prefix="${1}"/usr --disable-nls
 make

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d5cad4d148..89210cea0c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,12 +1,19 @@
 #!/usr/bin/env bash
-# Copyright 2006-2017 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
+# Copyright 2006-2018 Gentoo Foundation; Distributed under the GPL v2
 
 trap 'exit 1' TERM KILL INT QUIT ABRT
 
 # some basic output functions
 eerror() { echo "!!! $*" 1>&2; }
 einfo() { echo "* $*"; }
+
+if [[ ! ${BASH_VERSION:-0} == 4.[23456789]* ]]; then
+	eerror "This script requires GNU bash 4.2 or newer to run."
+	eerror "If you don't have one, please bootstrap bash 4.2 first:"
+	eerror "https://wiki.gentoo.org/wiki/Project:Prefix/Bootstrap"
+	exit 1
+fi
+
 # RAP (libc) mode is triggered on Linux kernel and glibc.
 is-rap() { [[ ${PREFIX_DISABLE_RAP} != "yes" && ${CHOST} = *linux-gnu* ]]; }
 rapx() { is-rap && echo $1 || echo $2; }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     301e21e7bd2317be312e7f110dbdea51a315abee
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 12:01:54 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 12:01:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=301e21e7

scripts/bootstrap-prefix: complete instructions for using newer bash

 scripts/bootstrap-prefix.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 89210cea0c..5f6e4e2c95 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -9,8 +9,12 @@ einfo() { echo "* $*"; }
 
 if [[ ! ${BASH_VERSION:-0} == 4.[23456789]* ]]; then
 	eerror "This script requires GNU bash 4.2 or newer to run."
-	eerror "If you don't have one, please bootstrap bash 4.2 first:"
-	eerror "https://wiki.gentoo.org/wiki/Project:Prefix/Bootstrap"
+	eerorr "You are using ${BASH} which is ${BASH_VERSION}"
+	eerror "If you don't have a newer one, please bootstrap bash 4.2 first:"
+	eerror "  https://wiki.gentoo.org/wiki/Project:Prefix/Bootstrap"
+	eerror "You can prepend a better bash's location to your PATH, or call"
+	eerror "this script with the alternative bash like so:"
+	eerror "  /path/to/bash-4.2 ${BASH_SOURCE[0]}"
 	exit 1
 fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     93a6d4fe02ee652fdf235715eb101a1e1e0623ec
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 09:50:30 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 09:50:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=93a6d4fe

scripts/bootstrap-prefix: make 64-bits libgcc_s available on Solaris

This bit somehow got lost.  Ensure that a 64-bit libgcc_s can be found
at runtime.  Somehow the toolchain is messed up like that.  This allows
programs compiled with gcc -m64 (like we do) to run.

 scripts/bootstrap-prefix.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5f6e4e2c95..7afede079e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1428,6 +1428,12 @@ bootstrap_stage2() {
 	# stage and rather have it continue instead of abort the build
 	export MAKEINFO="echo makeinfo GNU texinfo 4.13"
 
+	# on Solaris 64-bits, (at least up to 10) libgcc_s resides in a
+	# non-standard location, and the compiler doesn't seem to record
+	# this in rpath while it does find it, resulting in a runtime trap
+	[[ ${CHOST} == x86_64-*-solaris* || ${CHOST} == sparcv9-*-solaris* ]] && \
+		cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ >& /dev/null
+
 	# Disable RAP directory hacks of binutils and gcc.  If libc.so
 	# linker script provides no hint of ld-linux*.so*, ld should
 	# look into its default library path.  Prefix library pathes

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     626f41a9781c566d38796a9dabb7971a016b0e64
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 19:20:14 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 19:20:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=626f41a9

scripts/bootstrap-prefix: add small note about gcc-4.7 wrt c++

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7afede079e..56a99fa65b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -179,6 +179,8 @@ configure_toolchain() {
 	  # stage1 compiler that can build with C only.
 	  # But gcc-4.7 fails to build with gcc-5.4, so we check for
 	  # >gcc-4.7, as anything newer provides c++ anyway (#619542).
+	  # gcc-4.7 is the last version not to require a c++ compiler to
+	  # build
 	  eval $( (gcc -E - | grep compiler_stage1) <<-EOP
 		#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7))
 		  compiler_stage1+=" sys-devel/gcc"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     dc8db0e9395c9d61a5f3a9783d8fc22f08a4b8fb
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 07:33:07 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 03:27:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dc8db0e9

scripts/bootstrap-prefix.sh: use 17.0 profiles.

 scripts/bootstrap-prefix.sh | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6217915656..7996ccdfae 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -294,7 +294,17 @@ bootstrap_setup() {
 	# 2.6.32.1 -> 2*256^3 + 6*256^2 + 32 * 256 + 1 = 33955841
 	kver() { uname -r|cut -d\- -f1|awk -F. '{for (i=1; i<=NF; i++){s+=lshift($i,(4-i)*8)};print s}'; }
 	# >=glibc-2.20 requires >=linux-2.6.32.
-	profile-legacy() { [[ $(kver) -ge 33955840 ]] || echo /legacy; }
+	profile-kernel() {
+		if [[ $(kver) -ge 50462720 ]] ; then # 3.2
+			echo kernel-3.2+
+		elif [[ $(kver) -ge 33955840 ]] ; then # 2.6.32
+			echo kernel-2.6.32+
+		elif [[ $(kver) -ge 33951744 ]] ; then # 2.6.16
+			echo kernel-2.6.16+
+		elif [[ $(kver) -ge 33947648 ]] ; then # 2.6
+			echo kernel-2.6+
+		fi
+	}
 
 	local FS_INSENSITIVE=0
 	touch "${ROOT}"/FOO.$$
@@ -337,11 +347,11 @@ bootstrap_setup() {
 			ln -sf {,"${ROOT}"}/etc/group
 		[[ -f ${ROOT}/etc/resolv.conf ]] || ln -s {,"${ROOT}"}/etc/resolv.conf
 		[[ -f ${ROOT}/etc/hosts ]] || cp {,"${ROOT}"}/etc/hosts
-		local legacy=$(profile-legacy)
+		local profile_linux=default/linux/ARCH/17.0/prefix/$(profile-kernel)
+	else
+		local profile_linux=prefix/linux/ARCH
 	fi
 
-	local linux=$(rapx linux-standalone linux)
-	
 	case ${CHOST} in
 		powerpc-apple-darwin7)
 			profile="prefix/darwin/macos/10.3"
@@ -367,25 +377,26 @@ bootstrap_setup() {
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
 		i*86-pc-linux-gnu)
-			profile="prefix/${linux}/x86${legacy}"
+			profile=${profile_linux/ARCH/x86}
 			;;
 		x86_64-pc-linux-gnu)
-			profile="prefix/${linux}/amd64${legacy}"
+			profile=${profile_linux/ARCH/amd64}
+			profile=${profile/prefix/no-multilib/prefix}
 			;;
 		ia64-pc-linux-gnu)
-			profile="prefix/${linux}/ia64${legacy}"
+			profile=${profile_linux/ARCH/ia64}
 			;;
 		powerpc-unknown-linux-gnu)
-			profile="prefix/${linux}/ppc${legacy}"
+			profile=${profile_linux/ARCH/powerpc/ppc}
 			;;
 		powerpc64-unknown-linux-gnu)
-			profile="prefix/${linux}/ppc64${legacy}"
+			profile=${profile_linux/ARCH/powerpc/ppc64}
 			;;
 		aarch64-unknown-linux-gnu)
-			profile="prefix/${linux}/arm64${legacy}"
+			profile=${profile_linux/ARCH/arm64}
 			;;
 		armv7l-pc-linux-gnu)
-			profile="prefix/${linux}/arm${legacy}"
+			profile=${profile_linux/ARCH/arm}
 			;;
 		sparc-sun-solaris2.9)
 			profile="prefix/sunos/solaris/5.9/sparc"
@@ -447,6 +458,11 @@ bootstrap_setup() {
 		einfo "Your profile is set to ${fullprofile}."
 	fi
 
+	is-rap && cat >> "${ROOT}"/etc/portage/make.profile/make.defaults <<-'EOF'
+	# For baselayout-prefix in stage2 only.
+	ACCEPT_KEYWORDS="~${ARCH}-linux"
+	EOF
+
 	# Use package.use to disable in the portage tree to be shared between
 	# stage2 and stage3. The hack will be undone during tree sync in stage3.
 	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     168ff571c0bfec323443de4e9879a0d584dc0b68
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 14:19:15 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 03:27:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=168ff571

Point possible host pkg-config to stage2 files.

 scripts/bootstrap-prefix.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 56a99fa65b..6217915656 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -158,6 +158,9 @@ configure_cflags() {
 			fi
 			;;
 	esac
+
+	# point possible host pkg-config to stage2 files
+	export PKG_CONFIG_PATH=${ROOT}/tmp/usr/lib/pkgconfig
 }
 
 configure_toolchain() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     08bda7505668e5a9afbe06f62ee5483bca843532
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 03:20:06 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 03:27:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=08bda750

bootstrap-prefix.sh: disable the coreutils check for 32bit timestamp.

  This is need to support bootstrapping 32bit Prefix from 64bit host.

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b85c777174..a1cc564f61 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1722,6 +1722,7 @@ bootstrap_stage3() {
 	# here, which doesn't necessarily grok the system headers on newer
 	# OSX, confusing the buildsystem
 	ac_cv_c_decl_report=warning \
+	TIME_T_32_BIT_OK=yes \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	# gettext pulls in portage, which since 2.2.28 needs ssl enabled, so

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     3e4147bc0c77d9ea192a8eb273bc5926def4c8ca
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 03:08:26 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 03:27:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3e4147bc

bootstrap-prefix.sh: RAP: bootstrap binutils before gcc in stage3

  The stage2 binutils searches the host by default, and should not be
  used to link stage3 gcc. Stage3 binutils is need by stage3 gcc.

  There were problems to bootstrap binutils before gcc, most notably
  that binutils needs to link to zlib.  If that zlib is from stage2,
  or before glibc in stage3, it results in incompatible glibc symbols.
  If that zlib is from stage3 after glibc, rpath is needed because
  stage2 gcc does not have dynamic linker pointed to stage3 glibc.
  Adding rpath to LDFLAGS triggers glibc runtime failure.

  In this commit:

  1. filter-ldflags has been added to glibc ebuild to filter out
     rpath.  This has been committed to gentoo (a8ba9d20964964e7).

  2. after stage3 binutils is boostrapped, stage2 ld is renamed so
     that stage2 gcc can use stage3 ld.

  By doing so, we achieve a more logic-consistent bootstrap path.

 scripts/bootstrap-prefix.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7996ccdfae..b85c777174 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1570,7 +1570,7 @@ bootstrap_stage3() {
 	configure_toolchain || return 1
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
 	export CPPFLAGS="-isystem ${ROOT}/usr/include"
-	export LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+	export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,-rpath=${ROOT}/usr/$(get_libdir)"
 	unset CC CXX
 
 	emerge_pkgs() {
@@ -1621,12 +1621,16 @@ bootstrap_stage3() {
 			app-portage/elt-patches
 			sys-kernel/linux-headers
 			sys-libs/glibc
+			sys-devel/binutils-config
 			sys-libs/zlib
+			${linker}
 		)
 
 		BOOTSTRAP_RAP=yes \
 		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 		grep -q 'apiversion=9999' "${ROOT}"/usr/bin/perl && rm "${ROOT}"/usr/bin/perl
+		# remove stage2 ld so that stage3 ld is used by stage2 gcc.
+		[[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
 	else
 		pkgs=(
 			sys-apps/gentoo-functions
@@ -1687,12 +1691,6 @@ bootstrap_stage3() {
 	[[ ${CHOST} == *-darwin* ]] && rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm
 
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
-	if is-rap ; then
-		"${ROOT}"/sbin/ldconfig
-		# should be linked against stage3 zlib, and can only
-		# be compiled after gcc has the headers of Prefix glibc.
-		emerge_pkgs --nodeps sys-devel/binutils-config ${linker} || return 1
-	fi
 
 	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python2.7 )
 	# Use $ROOT tools where possible from now on.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     ea38c545ce810d80aea1eb7c6e5e4d2117e6f211
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 04:21:00 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 04:22:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ea38c545

bootstrap-prefix.sh: do not take a shortcut if ! is-rap.

 scripts/bootstrap-prefix.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a1cc564f61..1119dabc06 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1163,6 +1163,12 @@ bootstrap_bzip2() {
 }
 
 bootstrap_stage_host_gentoo() {
+	if ! is-rap ; then
+		einfo "Shortcut only supports prefix-standalone, but we are bootstrapping"
+		einfo "prefix-rpath. Do nothing."
+		return 0
+	fi
+	
 	if [[ ! -L ${ROOT}/tmp ]] ; then
 		if [[ -e ${ROOT}/tmp ]] ; then
 			einfo "${ROOT}/tmp exists and is not a symlink to ${HOST_GENTOO_EROOT}"
@@ -2305,7 +2311,7 @@ EOF
 	# Figure out if we are bootstrapping from an existing Gentoo
 	# It can be forced by setting HOST_GENTOO_EROOT manually
 	local t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> /dev/null)
-	if [[ ! -d ${HOST_GENTOO_EROOT} ]] && [[ -d ${t_GENTOO_EROOT} ]]; then
+	if [[ ! -d ${HOST_GENTOO_EROOT} && -d ${t_GENTOO_EROOT} ]]; then
 		cat <<EOF
 
 Sweet, a Gentoo Penguin is found at ${t_GENTOO_EROOT}.  Hey, you are

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     588d918f891fa76edb711df322b713e9072214ed
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 02:11:18 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 02:11:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=588d918f

bootstrap-prefix.sh: no-multilib should not be leaked into prefix-rpath

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1119dabc06..5f2e0d473f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -381,7 +381,7 @@ bootstrap_setup() {
 			;;
 		x86_64-pc-linux-gnu)
 			profile=${profile_linux/ARCH/amd64}
-			profile=${profile/prefix/no-multilib/prefix}
+			profile=${profile/17.0/17.0/no-multilib}
 			;;
 		ia64-pc-linux-gnu)
 			profile=${profile_linux/ARCH/ia64}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     08047a53f5d51d7a370ec0d5d047253cad60dc2a
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 12:08:17 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 12:08:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=08047a53

bootstrap-prefix.sh: expose stage3 dynamic linker early on.

  The stage3 ld should use stage3 dynamic linker, to prevent from
  symbol clashes between host dynamic linker and stage3 shared
  libraries, like the errors below.

  4  /home/xxx/gentoo/usr/bin/ld: /lib64/libc.so.6: version
  `GLIBC_2.14' not found (required by /home/xxx/gentoo/usr/bin/ld
  5  /home/xxx/gentoo/usr/bin/ld: /lib64/libc.so.6: version
  `GLIBC_2.14' not found (required by /home/xxx/gentoo/usr/lib64/binutils/x86_64-pc-linux-gnu/2.29.1/libbfd-2.29.1.so)
  6  /home/xxx/gentoo/usr/bin/ld: /lib64/libc.so.6: version
  `GLIBC_2.14' not found (required by /home/xxx/gentoo/usr/lib64/libz.so.1)

 scripts/bootstrap-prefix.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5f2e0d473f..6e63af8575 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1627,14 +1627,22 @@ bootstrap_stage3() {
 			app-portage/elt-patches
 			sys-kernel/linux-headers
 			sys-libs/glibc
-			sys-devel/binutils-config
-			sys-libs/zlib
-			${linker}
 		)
 
 		BOOTSTRAP_RAP=yes \
 		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 		grep -q 'apiversion=9999' "${ROOT}"/usr/bin/perl && rm "${ROOT}"/usr/bin/perl
+
+		pkgs=(
+			sys-devel/binutils-config
+			sys-libs/zlib
+			${linker}
+		)
+		# use the new dynamic linker in place of rpath from now on.
+		RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
+		export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
+		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+
 		# remove stage2 ld so that stage3 ld is used by stage2 gcc.
 		[[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
 	else
@@ -1681,11 +1689,9 @@ bootstrap_stage3() {
 			&& ln -s ../../../libc++.1.dylib libstdc++.6.0.9.dylib )
 	fi
 
-	RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
 	# try to get ourself out of the mudd, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \
 	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
-	LDFLAGS="${LDFLAGS} $(rapx -Wl,--dynamic-linker=${RAP_DLINKER})" \
 	PYTHON_COMPAT_OVERRIDE=python2.7 \
 	emerge_pkgs --nodeps ${compiler} || return 1
 	# undo libgcc_s.so path of stage2

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     aed372aff9554d3ac8471d2beac973325f464f23
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  7 18:14:49 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Feb  7 18:14:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=aed372af

scripts/bootstrap-prefix: bump snapshot for bug #646680

Closes: https://bugs.gentoo.org/646680

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6e63af8575..55b1d1b33a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -521,7 +521,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180103"
+	local PV="20180206"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     57ab1106d40685de40ea05113233f0411cbf647d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 08:15:21 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 08:15:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=57ab1106

scripts/bootstrap-prefix: bump snapshot for openssl sync, bug #647006

Closes: https://bugs.gentoo.org/647006

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 55b1d1b33a..cf910a1854 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -521,7 +521,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180206"
+	local PV="20180208"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7874d8a7cfa074967cd5a2970f36c7754002c380
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 08:56:48 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 08:56:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7874d8a7

scripts/bootstrap-prefix: fix typo

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cf910a1854..07905d21ef 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -9,7 +9,7 @@ einfo() { echo "* $*"; }
 
 if [[ ! ${BASH_VERSION:-0} == 4.[23456789]* ]]; then
 	eerror "This script requires GNU bash 4.2 or newer to run."
-	eerorr "You are using ${BASH} which is ${BASH_VERSION}"
+	eerror "You are using ${BASH} which is ${BASH_VERSION}"
 	eerror "If you don't have a newer one, please bootstrap bash 4.2 first:"
 	eerror "  https://wiki.gentoo.org/wiki/Project:Prefix/Bootstrap"
 	eerror "You can prepend a better bash's location to your PATH, or call"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a2c6fa7dc9b2ad29d65a4eece1766c91433cfd21
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 09:41:37 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 09:41:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a2c6fa7d

scripts/bootstrap-prefix: avoid pod2man failures in bootstrap_gnu

pod2man may be very old, not understanding switches like --utf8.  It's a
bit silly to die on failures like that, so just don't build man-pages
(we don't need them in stage1 anyway).

 scripts/bootstrap-prefix.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 07905d21ef..0b30448fc9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -732,6 +732,9 @@ bootstrap_gnu() {
 	# but portage's multijob needs more unique pipe names
 	[[ ${PN},${CHOST} == bash,*-aix* ]] &&
 	export CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-DUSE_MKTEMP"
+	# pod2man may be too old (not understanding --utf8) but we don't
+	# care about manpages at this stage
+	export ac_cv_path_POD2MAN=no
 
 	# Darwin9 in particular doesn't compile when using system readline,
 	# but we don't need any groovy input at all, so just disable it

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f3dced826b626399ffc626970171b01a122e1fa1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 09:43:47 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 09:43:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f3dced82

scripts/bootstrap-prefix: avoid sending -rpath onto the linker on Darwin

During the bootstrap we cannot rely on the linker being new enough to
understand -rpath.

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0b30448fc9..3ef6e06e35 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1579,7 +1579,9 @@ bootstrap_stage3() {
 	configure_toolchain || return 1
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
 	export CPPFLAGS="-isystem ${ROOT}/usr/include"
-	export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,-rpath=${ROOT}/usr/$(get_libdir)"
+	export LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+	[[ ${CHOST} == *-darwin* ]] || \
+		LDFLAGS+=" -Wl,-rpath=${ROOT}/usr/$(get_libdir)"
 	unset CC CXX
 
 	emerge_pkgs() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f626d52c4995d3d1337cc91b8b47582f455ec6b8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 07:09:15 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 07:09:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f626d52c

scripts/bootstrap-prefix: add back initial support for ppc-darwin9

 scripts/bootstrap-prefix.sh | 45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3ef6e06e35..cf7d96721d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -168,6 +168,7 @@ configure_toolchain() {
 	local gcc_deps="dev-libs/gmp dev-libs/mpfr dev-libs/mpc"
 	compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc"
 	compiler_stage1="${gcc_deps} sys-devel/gcc-config"
+	compiler_type="gcc"
 	case ${CHOST} in
 	*-cygwin*)
 	  # not supported in gcc-4.7 yet, easy enough to install g++
@@ -202,10 +203,37 @@ configure_toolchain() {
 		dev-util/cmake
 		dev-util/ninja"
 	case ${CHOST} in
+		powerpc-*darwin*)
+			compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
+			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
+			local mycc=
+			case "${ccvers}" in
+				*"(GCC) 4.2.1 "*)
+					linker=sys-devel/binutils-apple
+					mycc=gcc
+					;;
+				*"(GCC) 4.0.1 "*)
+					# need gcc-4.2.1 to compile llvm
+					linker="=sys-devel/binutils-apple-3.2"
+					compiler_stage1+="
+						${gcc_deps}
+						sys-devel/gcc-config
+						sys-devel/gcc-apple
+						sys-devel/binutils-apple"
+					mycc=gcc
+					;;
+				*)
+					eerror "unknown compiler"
+					return 1
+					;;
+			esac
+			compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc-apple"
+			;;
 		*-darwin*)
 			# for compilers choice, see bug:
 			# https://bugs.gentoo.org/show_bug.cgi?id=538366
 			compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
+			compiler_type="clang"
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
 			local mycc=
 			case "${ccvers}" in
@@ -1524,12 +1552,12 @@ bootstrap_stage2() {
 		fi
 	done
 
-	if [[ ${CHOST} == *darwin* ]] ; then
+	if [[ ${compiler_type} == clang ]] ; then
 		# we use Clang as our toolchain compiler, so we need to make
 		# sure we actually use it
 		{
 			echo
-			echo "# System compiler on Darwin Prefix is Clang, do not remove this"
+			echo "# System compiler on $(uname) Prefix is Clang, do not remove this"
 			echo "CC=${CHOST}-clang"
 			echo "CXX=${CHOST}-clang++"
 			echo "OBJC=${CHOST}-clang"
@@ -1548,6 +1576,7 @@ bootstrap_stage2() {
 		cp "${ROOT}"/tmp/usr/${CHOST}/lib/gcc/* "${ROOT}"/usr/${CHOST}/lib/gcc
 	fi
 
+	touch "${ROOT}/tmp/.stage2-finished"
 	einfo "stage2 successfully finished"
 }
 
@@ -1561,8 +1590,10 @@ bootstrap_stage3() {
 		eerror "emerge not found, did you bootstrap stage1?"
 		return 1
 	fi
-	
-	if [[ ${CHOST} == *-darwin* ]] ; then
+
+	configure_toolchain || return 1
+
+	if [[ ${compiler_type} == clang ]] ; then
 		if ! type -P clang > /dev/null ; then
 			eerror "clang not found, did you bootstrap stage2?"
 			return 1
@@ -1576,7 +1607,6 @@ bootstrap_stage3() {
 
 	get_libdir() { portageq envvar LIBDIR_$(portageq envvar ABI) || echo lib; }
 
-	configure_toolchain || return 1
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
 	export CPPFLAGS="-isystem ${ROOT}/usr/include"
 	export LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
@@ -1681,7 +1711,7 @@ bootstrap_stage3() {
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
 
-	# llvm-3.5 doesn't find c++11 headers/lib by default, make it so
+	# llvm-3.5 doesn't find C++11 headers/lib by default, make it so
 	if [[ ${CHOST} == *-darwin9 ]] ; then
 		export OVERRIDE_CXXFLAGS="-I${ROOT}/tmp/usr/include/c++/v1 -fPIC"
 		# -fPIC is here because we need it, but the toolchain doesn't
@@ -2489,8 +2519,7 @@ EOF
 	# when we find gcc there (it's needed to bootstrap llvm)
 	local compiler=gcc
 	[[ ${CHOST} == *-darwin* ]] && compiler=clang
-	if ! [[ -x ${EPREFIX}/usr/bin/${compiler} \
-		|| -x ${EPREFIX}/tmp/usr/bin/${compiler} ]] \
+	if ! [[ -e ${EPREFIX}/tmp/.stage2-finished ]] \
 		&& ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2_log ; then
 		# stage 2 fail
 		cat << EOF

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b4ce7744e23aaae6b698a9866b4922d9aeb22c95
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 07:28:37 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 07:28:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b4ce7744

scripts/bootstrap-prefix: bump snapshot for bison and autoconf fixes

Bug: https://bugs.gentoo.org/648162
Bug: https://bugs.gentoo.org/648156

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cf7d96721d..ea7a874261 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -549,7 +549,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180208"
+	local PV="20180219"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     396a93ce5cbb65602468a35849df558443a59ebe
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 07:57:03 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 08:00:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=396a93ce

tandalonebootstrap-prefix.sh: Add back BOOTSTRAP_RAP for zlib.

  By default zlib builds several example executables, even if what we
  want is a library.  It does not matter usually.  But during stage3,
  after glibc and before binutils, we cannot build executable
  reliably.  These should be disabled.

Closes: https://bugs.gentoo.org/647144

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ea7a874261..0633207d9a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1676,6 +1676,7 @@ bootstrap_stage3() {
 		# use the new dynamic linker in place of rpath from now on.
 		RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
 		export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
+		BOOTSTRAP_RAP=yes \
 		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
 		# remove stage2 ld so that stage3 ld is used by stage2 gcc.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     db77fbabf914f5165a6be32f58fe0ebbe9940531
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 18:43:02 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 18:43:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=db77fbab

scripts/bootstrap-bash: copy efetch behaviour from bootstrap-prefix

ftp may not be available or working, so try the fallback behaviour from
bootstrap-prefix.

Patch based on patch by Askar Bektassov (Аскар Бектасов)

 scripts/bootstrap-bash.sh | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-bash.sh b/scripts/bootstrap-bash.sh
index be0b36d831..a3d78afea0 100755
--- a/scripts/bootstrap-bash.sh
+++ b/scripts/bootstrap-bash.sh
@@ -8,7 +8,10 @@
 # dynamic function calling.  So, we need to bootstrap bash outside the
 # bootstrap script, which is the purpose of this script.
 
-[ -z "$1" ] && exit -1
+if [ -z "$1" ] ; then
+	echo "usage: ${0} <location>" > /dev/stderr
+	exit -1
+fi
 
 mkdir -p "$1"
 cd "$1"
@@ -17,7 +20,34 @@ cd bash-build
 
 GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org/distfiles"}
 
-ftp "${GENTOO_MIRRORS}/bash-4.2.tar.gz"
+if [ ! -e bash-4.2.tar.gz ] ; then
+	eerror() { echo "!!! $*" 1>&2; }
+	einfo() { echo "* $*"; }
+
+	if [ -z ${FETCH_COMMAND} ] ; then
+		# Try to find a download manager, we only deal with wget,
+		# curl, FreeBSD's fetch and ftp.
+		if [ x$(type -t wget) == "xfile" ] ; then
+			FETCH_COMMAND="wget"
+			[ $(wget -h) == *"--no-check-certificate"* ] && FETCH_COMMAND+=" --no-check-certificate"
+		elif [ x$(type -t curl) == "xfile" ] ; then
+			einfo "WARNING: curl doesn't fail when downloading fails, please check its output carefully!"
+			FETCH_COMMAND="curl -f -L -O"
+		elif [ x$(type -t fetch) == "xfile" ] ; then
+			FETCH_COMMAND="fetch"
+		elif [ x$(type -t ftp) == "xfile" ] &&
+			 [ ${CHOST} != *-cygwin* || ! $(type -P ftp) -ef $(cygpath -S)/ftp ] ; then
+			FETCH_COMMAND="ftp"
+		else
+			eerror "no suitable download manager found (need wget, curl, fetch or ftp)"
+			eerror "could not download ${1##*/}"
+			eerror "download the file manually, and put it in ${PWD}"
+			exit 1
+		fi
+	fi
+	${FETCH_COMMAND} "${GENTOO_MIRRORS}/bash-4.2.tar.gz" < /dev/null
+fi
+
 gzip -d bash-4.2.tar.gz
 tar -xf bash-4.2.tar
 cd bash-4.2

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     bdb73088dff33872b9f18a81fcc353aacab2e4c2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 08:11:31 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 08:11:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bdb73088

scripts/bootstrap-prefix: lift restriction on bash-4.2

Allow older bash (like 2.59 or 3.00) to be used in chost, interactive,
stage1, since the latter builds bash in such a way that stage2 and 3 can
use more advanced features.

Bug: https://bugs.gentoo.org/650278
Bug: https://bugs.gentoo.org/650284

 scripts/bootstrap-prefix.sh | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0633207d9a..46e7a09bab 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -7,17 +7,6 @@ trap 'exit 1' TERM KILL INT QUIT ABRT
 eerror() { echo "!!! $*" 1>&2; }
 einfo() { echo "* $*"; }
 
-if [[ ! ${BASH_VERSION:-0} == 4.[23456789]* ]]; then
-	eerror "This script requires GNU bash 4.2 or newer to run."
-	eerror "You are using ${BASH} which is ${BASH_VERSION}"
-	eerror "If you don't have a newer one, please bootstrap bash 4.2 first:"
-	eerror "  https://wiki.gentoo.org/wiki/Project:Prefix/Bootstrap"
-	eerror "You can prepend a better bash's location to your PATH, or call"
-	eerror "this script with the alternative bash like so:"
-	eerror "  /path/to/bash-4.2 ${BASH_SOURCE[0]}"
-	exit 1
-fi
-
 # RAP (libc) mode is triggered on Linux kernel and glibc.
 is-rap() { [[ ${PREFIX_DISABLE_RAP} != "yes" && ${CHOST} = *linux-gnu* ]]; }
 rapx() { is-rap && echo $1 || echo $2; }
@@ -768,6 +757,13 @@ bootstrap_gnu() {
 	# but we don't need any groovy input at all, so just disable it
 	[[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline"
 
+	# ensure we don't read system-wide shell initialisation, it may
+	# contain cruft, bug #650284
+	[[ ${PN} == "bash" ]] && \
+		export CPPFLAGS="${CPPFLAGS} \
+			-DSYS_BASHRC=\'\"${ROOT}/etc/bash/bashrc\"\' \
+			-DSYS_BASH_LOGOUT=\'\"${ROOT}/etc/bash/bash_logout\"\'"
+
 	# Don't do ACL stuff on Darwin, especially Darwin9 will make
 	# coreutils completely useless (install failing on everything)
 	# Don't try using gmp either, it may be that just the library is
@@ -1261,14 +1257,15 @@ bootstrap_stage1() {
 	[[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] || (bootstrap_patch) || return 1
 	[[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1
 	[[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] || bootstrap_gawk || return 1
-	[[ $(LANG=C bash --version 2>&1) == "GNU bash, version 4."[23456789]* && ${CHOST} != *-aix* ]] \
-		|| [[ -x ${ROOT}/tmp/usr/bin/bash ]] \
+	# always build our own bash, for we don't know what devilish thing
+	# we're working with now, bug #650284
+	[[ -x ${ROOT}/tmp/usr/bin/bash ]] \
 		|| (bootstrap_bash) || return 1
 	type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1
 	type -P xz > /dev/null || (bootstrap_xz) || return 1
 	# Some host tools need to be wrapped to be useful for us.
 	# We put them in tmp/usr/local/bin, to not accidentally
-	# be identified as stage1-installed like in bug#615410.
+	# be identified as stage1-installed like in bug #615410.
 	mkdir -p "${ROOT}"/tmp/usr/local/bin
 	case ${CHOST} in
 		*-*-aix*)
@@ -1331,6 +1328,8 @@ bootstrap_stage1() {
 
 	# important to have our own (non-flawed one) since Python (from
 	# Portage) and binutils use it
+	# note that this actually breaks the concept of stage1, this will be
+	# compiled for the target prefix
 	for zlib in ${ROOT}/tmp/usr/lib/libz.* ; do
 		[[ -e ${zlib} ]] && break
 		zlib=
@@ -1992,7 +1991,7 @@ EOF
 		# starting on purpose a shell here iso ${!flag} because I want
 		# to know if the shell initialisation files trigger this
 		# note that this code is so complex because it handles both
-		# C-shell as sh
+		# C-shell as well as *sh
 		dvar="echo \"((${flag}=\${${flag}}))\""
 		dvar="$(echo "${dvar}" | env -i HOME=$HOME $SHELL -l 2>/dev/null)"
 		if [[ ${dvar} == *"((${flag}="?*"))" ]] ; then
@@ -2471,6 +2470,11 @@ EOF
 	fi
 	echo
 
+	# because we unset ROOT from environment above, and we didn't set
+	# ROOT as argument in the script, we set ROOT here to the EPREFIX we
+	# just harvested
+	ROOT=${EPREFIX}
+
 	if [[ -d ${HOST_GENTOO_EROOT} ]]; then
 		if ! [[ -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage_host_gentoo ; then
 			# stage host gentoo fail
@@ -2488,7 +2492,7 @@ EOF
 	fi
 	
 	if ! [[ -x ${EPREFIX}/usr/lib/portage/bin/emerge || -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge || -x ${EPREFIX}/tmp/usr/bin/emerge  ]] \
-			&& ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage1_log ; then
+			&& ! bootstrap_stage1_log ; then
 		# stage 1 fail
 		cat << EOF
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7fa0395a9aff1785a8836ec0b7d0518a9d9c41b1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 14 09:06:11 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 09:06:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7fa0395a

scripts/bootstrap-prefix: ensure generic vars are initialised

Since stage1 is now called directly from interactive, we need to ensure
the generic variables are set.

Closes: https://bugs.gentoo.org/650448

 scripts/bootstrap-prefix.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 46e7a09bab..2c743b1829 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2749,6 +2749,19 @@ case ${CHOST}:${LC_ALL}:${LANG} in
 	;;
 esac
 
+CXXFLAGS="${CXXFLAGS:-${CFLAGS}}"
+export PORTDIR=${PORTDIR:-"${ROOT}/usr/portage"}
+export DISTDIR=${DISTDIR:-"${PORTDIR}/distfiles"}
+PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/var/tmp}
+DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
+GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
+GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
+SNAPSHOT_HOST=$(rapx ${GENTOO_MIRRORS} http://rsync.prefix.bitzolder.nl)
+SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
+GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"
+
+export MAKE CONFIG_SHELL
+
 # Just guessing a prefix is kind of scary.  Hence, to make it a bit less
 # scary, we force the user to give the prefix location here.  This also
 # makes the script a bit less dangerous as it will die when just run to
@@ -2786,19 +2799,6 @@ case $ROOT in
 	;;
 esac
 
-CXXFLAGS="${CXXFLAGS:-${CFLAGS}}"
-export PORTDIR=${PORTDIR:-"${ROOT}/usr/portage"}
-export DISTDIR=${DISTDIR:-"${PORTDIR}/distfiles"}
-PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/var/tmp}
-DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
-GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
-GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
-SNAPSHOT_HOST=$(rapx ${GENTOO_MIRRORS} http://rsync.prefix.bitzolder.nl)
-SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
-GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"
-
-export MAKE CONFIG_SHELL
-
 
 einfo "Bootstrapping Gentoo prefixed portage installation using"
 einfo "host:   ${CHOST}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     75393f50a8aebb373d1edb410408b981c397d53d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 11:53:53 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 11:53:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=75393f50

scripts/bootstrap-prefix: ensure we set helper vars after setting ROOT

This should fix another issue reported by Jeremiah O'Neil that was
introduced by the previous fix.  I didn't pay attention well enough to
the order of things.  Now it should work better.

Closes: https://bugs.gentoo.org/650448

 scripts/bootstrap-prefix.sh | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2c743b1829..b9fbf3d4c2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1828,6 +1828,21 @@ bootstrap_stage3_log() {
 	return ${PIPESTATUS[0]}
 }
 
+set_helper_vars() {
+	CXXFLAGS="${CXXFLAGS:-${CFLAGS}}"
+	export PORTDIR=${PORTDIR:-"${ROOT}/usr/portage"}
+	export DISTDIR=${DISTDIR:-"${PORTDIR}/distfiles"}
+	PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/var/tmp}
+	DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
+	GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
+	GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
+	SNAPSHOT_HOST=$(rapx ${GENTOO_MIRRORS} http://rsync.prefix.bitzolder.nl)
+	SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
+	GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"
+
+	export MAKE CONFIG_SHELL
+}
+
 bootstrap_interactive() {
 	# No longer support gen_usr_ldscript stuff and the /usr split it
 	# works around for in new bootstraps, this must be in line with what
@@ -2470,11 +2485,6 @@ EOF
 	fi
 	echo
 
-	# because we unset ROOT from environment above, and we didn't set
-	# ROOT as argument in the script, we set ROOT here to the EPREFIX we
-	# just harvested
-	ROOT=${EPREFIX}
-
 	if [[ -d ${HOST_GENTOO_EROOT} ]]; then
 		if ! [[ -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage_host_gentoo ; then
 			# stage host gentoo fail
@@ -2491,13 +2501,19 @@ EOF
 		fi
 	fi
 	
+	# because we unset ROOT from environment above, and we didn't set
+	# ROOT as argument in the script, we set ROOT here to the EPREFIX we
+	# just harvested
+	ROOT="${EPREFIX}"
+	set_helper_vars
+
 	if ! [[ -x ${EPREFIX}/usr/lib/portage/bin/emerge || -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge || -x ${EPREFIX}/tmp/usr/bin/emerge  ]] \
 			&& ! bootstrap_stage1_log ; then
 		# stage 1 fail
 		cat << EOF
 
 I tried running
-  ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage1
+  bootstrap_stage1_log
 but that failed :(  I have no clue, really.  Please find friendly folks
 in #gentoo-prefix on irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list,
 or file a bug at bugs.gentoo.org under Gentoo/Alt, Prefix Support.
@@ -2507,6 +2523,8 @@ EOF
 		exit 1
 	fi
 
+	unset ROOT
+
 	# stage1 has set a profile, which defines CHOST, so unset any CHOST
 	# we've got here to avoid cross-compilation due to slight
 	# differences caused by our guessing vs. what the profile sets.
@@ -2749,19 +2767,6 @@ case ${CHOST}:${LC_ALL}:${LANG} in
 	;;
 esac
 
-CXXFLAGS="${CXXFLAGS:-${CFLAGS}}"
-export PORTDIR=${PORTDIR:-"${ROOT}/usr/portage"}
-export DISTDIR=${DISTDIR:-"${PORTDIR}/distfiles"}
-PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/var/tmp}
-DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
-GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
-GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
-SNAPSHOT_HOST=$(rapx ${GENTOO_MIRRORS} http://rsync.prefix.bitzolder.nl)
-SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
-GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"
-
-export MAKE CONFIG_SHELL
-
 # Just guessing a prefix is kind of scary.  Hence, to make it a bit less
 # scary, we force the user to give the prefix location here.  This also
 # makes the script a bit less dangerous as it will die when just run to
@@ -2784,6 +2789,7 @@ elif [[ -z $1 ]] ; then
 fi
 
 ROOT="$1"
+set_helper_vars
 
 case $ROOT in
 	chost.guess)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5432992f824454bce5266a2b99a1bb275823fcff
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  9 07:38:06 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Apr  9 07:38:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5432992f

scripts/bootstrap-prefix: bump snapshot, adds ppc-macos support

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b9fbf3d4c2..b19bccc2d4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -538,7 +538,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180219"
+	local PV="20180408"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     d42932051814214ed8db7f386836e5d228984bae
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 11:21:21 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon May 14 11:21:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d4293205

bootstrap-prefix.sh(stage1): bump bash-4.3, for cygwin 4.3_p48 + patch

 scripts/bootstrap-prefix.sh | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b19bccc2d4..c9d7f52db2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -729,6 +729,23 @@ bootstrap_gnu() {
 	[[ -d ${S} ]] || return 1
 	cd "${S}" || return 1
 
+	if [[ ${PN}-${PV} == "bash-4.3" && ${CHOST} == *-cygwin* ]] ; then
+		local p patchopts
+		for p in \
+			"-p0" \
+			"${GENTOO_MIRRORS}/distfiles/bash43-"{001..048} \
+			"-p2" \
+			https://gitweb.gentoo.org/repo/proj/prefix.git/plain/app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch \
+		; do
+			if [[ ${p} == -* ]] ; then
+				patchopts=${p}
+				continue
+			fi
+			efetch "${p}" || return 1
+			patch --forward --no-backup-if-mismatch ${patchopts} < "${DISTDIR}/${p##*/}" || return 1
+		done
+	fi
+
 	local myconf=""
 	if [[ ${PN} == "grep" ]] ; then
 		# Solaris and OSX don't like it when --disable-nls is set,
@@ -754,8 +771,9 @@ bootstrap_gnu() {
 	export ac_cv_path_POD2MAN=no
 
 	# Darwin9 in particular doesn't compile when using system readline,
-	# but we don't need any groovy input at all, so just disable it
-	[[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline"
+	# but we don't need any groovy input at all, so just disable it,
+	# except for Cygwin, where the patch above would fail to compile
+	[[ ${PN} == "bash" && ${CHOST} != *-cygwin* ]] && myconf="${myconf} --disable-readline"
 
 	# ensure we don't read system-wide shell initialisation, it may
 	# contain cruft, bug #650284
@@ -1139,6 +1157,7 @@ bootstrap_texinfo() {
 }
 
 bootstrap_bash() {
+	bootstrap_gnu bash 4.3 ||
 	bootstrap_gnu bash 4.2
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     fff671ef82ccf8fc34a252b0aa4b9703ab776423
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 11:45:16 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon May 14 11:45:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fff671ef

bootstrap-prefix.sh: ignore host gtar, we bootstrap GNU tar eventually

When host gtar is not in /usr/bin:/bin, we would need to preserve full
host gtar path into TAR variable. But we do bootstrap GNU tar anyway if
plain 'tar' is not GNU tar, and until that any tar should suffice.

 scripts/bootstrap-prefix.sh | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c9d7f52db2..a7eeaf96f0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -11,11 +11,6 @@ einfo() { echo "* $*"; }
 is-rap() { [[ ${PREFIX_DISABLE_RAP} != "yes" && ${CHOST} = *linux-gnu* ]]; }
 rapx() { is-rap && echo $1 || echo $2; }
 
-# prefer gtar over tar
-[[ x$(type -t gtar) == "xfile" ]] \
-	&& TAR="gtar" \
-	|| TAR="tar"
-
 ## Functions Start Here
 
 econf() {
@@ -90,7 +85,7 @@ efetch() {
 # 	rm -rf ${S}
 # 	mkdir -p ${S}
 # 	cd ${S}
-# 	$TAR -zxf ${DISTDIR}/${A} || return 1
+# 	tar -zxf ${DISTDIR}/${A} || return 1
 # 	S=${S}/${PN}-${PV}
 # 	cd ${S}
 
@@ -530,7 +525,7 @@ do_tree() {
 		efetch "$1/$2" || return 1
 		[[ -e ${PORTDIR} ]] || mkdir -p ${PORTDIR}
 		einfo "Unpacking, this may take a while"
-		bzip2 -dc ${DISTDIR}/$2 | $TAR -xf - -C ${PORTDIR} --strip-components=1 || return 1
+		bzip2 -dc ${DISTDIR}/$2 | tar -xf - -C ${PORTDIR} --strip-components=1 || return 1
 		touch ${PORTDIR}/.unpacked
 	fi
 }
@@ -624,7 +619,7 @@ bootstrap_portage() {
 	rm -rf "${S}" >& /dev/null
 	mkdir -p "${S}" >& /dev/null
 	cd "${S}"
-	bzip2 -dc "${DISTDIR}/${A}" | $TAR -xf - || return 1
+	bzip2 -dc "${DISTDIR}/${A}" | tar -xf - || return 1
 	S="${S}/prefix-portage-${PV}"
 	cd "${S}"
 
@@ -712,13 +707,13 @@ bootstrap_gnu() {
 		mkdir -p "${S}"
 		cd "${S}"
 		if [[ ${t} == "tar.gz" ]] ; then
-			gzip -dc "${DISTDIR}"/${URL##*/} | $TAR -xf - || continue
+			gzip -dc "${DISTDIR}"/${URL##*/} | tar -xf - || continue
 		elif [[ ${t} == "tar.xz" ]] ; then
-			xz -dc "${DISTDIR}"/${URL##*/} | $TAR -xf - || continue
+			xz -dc "${DISTDIR}"/${URL##*/} | tar -xf - || continue
 		elif [[ ${t} == "tar.bz2" ]] ; then
-			bzip2 -dc "${DISTDIR}"/${URL##*/} | $TAR -xf - || continue
+			bzip2 -dc "${DISTDIR}"/${URL##*/} | tar -xf - || continue
 		elif [[ ${t} == "tar" ]] ; then
-			$TAR -xf "${DISTDIR}"/${A} || continue
+			tar -xf "${DISTDIR}"/${A} || continue
 		else
 			einfo "unhandled extension: $t"
 			return 1
@@ -856,7 +851,7 @@ bootstrap_python() {
 	rm -rf "${S}"
 	mkdir -p "${S}"
 	cd "${S}"
-	bzip2 -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1
+	bzip2 -dc "${DISTDIR}"/${A} | tar -xf - || return 1
 	S="${S}"/Python-${PV}
 	cd "${S}"
 	rm -rf Modules/_ctypes/libffi* || return 1
@@ -1017,9 +1012,9 @@ bootstrap_zlib_core() {
 	mkdir -p "${S}"
 	cd "${S}"
 	if [[ ${A} == *.tar.gz ]] ; then
-		gzip -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1
+		gzip -dc "${DISTDIR}"/${A} | tar -xf - || return 1
 	else
-		bzip2 -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1
+		bzip2 -dc "${DISTDIR}"/${A} | tar -xf - || return 1
 	fi
 	S="${S}"/zlib-${PV}
 	cd "${S}"
@@ -1193,7 +1188,7 @@ bootstrap_bzip2() {
 	rm -rf "${S}"
 	mkdir -p "${S}"
 	cd "${S}"
-	gzip -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1
+	gzip -dc "${DISTDIR}"/${A} | tar -xf - || return 1
 	S="${S}"/${PN}-${PV}
 	cd "${S}"
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     f4fb1c78288639ebb25dc6ec5f00df4b2de6912f
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 13:02:11 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed May 16 13:02:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f4fb1c78

bootstrap-prefix.sh: try to fix 32bit solaris

 scripts/bootstrap-prefix.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a7eeaf96f0..45e1d23f57 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -942,6 +942,9 @@ EOP
 			# libgcc_s.so is on Solaris
 			libdir="-L/usr/sfw/lib/64"
 		;;
+		*-solaris*) # 32bit
+			libdir="-L/usr/sfw/lib"
+		;;
 	esac
 
 	# python refuses to find the zlib headers that are built in the offset,

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     69693f3801f660315eae75a17e3877d569891032
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 11:22:55 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu May 24 11:22:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=69693f38

bootstrap-prefix.sh(stage3 PREROOTPATH): /usr/bin before /bin

When /bin is before /usr/bin and /bin is symlinked to /usr/bin, then
python3 does locate itself in /bin, resulting in python3 header files
location in (the not existing) /include rather than /usr/include.

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 45e1d23f57..77ec59e3bf 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1634,7 +1634,7 @@ bootstrap_stage3() {
 		# stage3 tools should be used first.
 		# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
 		# needed with host portage.
-		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{,usr/}{,lib/llvm/5/}{s,}bin | sed "s, ,:${ROOT},g") \
+		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/5/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
 		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e6804a1a78af920b0a9aed027a1582e7a06ee87f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 07:12:54 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 27 07:12:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e6804a1a

scripts/bootstrap-prefix: bump portage and tree snapshots, bug #655414

Use a newer portage, and a snapshot which includes that portage.

Bug: https://bugs.gentoo.org/655414

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 77ec59e3bf..8344fd5ef9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -533,7 +533,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180408"
+	local PV="20180525"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -605,8 +605,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.18"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.18"
+	STABLE_PV="2.3.40"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     984ce333349f09cd7499f6756700327fb1730c12
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 06:34:38 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 29 06:34:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=984ce333

scripts/bootstrap-prefix: bump snapshots for portage fix

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8344fd5ef9..735fd95f0e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -533,7 +533,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180525"
+	local PV="20180528"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -605,8 +605,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.40"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40"
+	STABLE_PV="2.3.40.1"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40.1"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     770af4c6adfd69343cf13b112a2b72ec4fd633b5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  1 18:39:12 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun  1 18:39:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=770af4c6

scripts/bootstrap-prefix: fix bootstrap on macOS to get past stage2

Recent Xcode have recent enough clang to bootstrap the latest clang,
which is installed in a non-standard place.  Add some more versions for
this and the future.

 scripts/bootstrap-prefix.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 735fd95f0e..75eaf07356 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -533,7 +533,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180528"
+	local PV="20180530"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -1585,7 +1585,9 @@ bootstrap_stage2() {
 		# we're in a cross-ish situation (at least according to
 		# multilib.eclass -- can't blame it at this point really)
 		# do it ourselves here to make the bootstrap continue
-		( cd "${ROOT}"/tmp/usr/bin && ln -s clang ${CHOST}-clang && ln -s clang++ ${CHOST}-clang++ )
+		if [[ -x "${ROOT}"/tmp/usr/bin/${CHOST}-clang ]] ; then
+			( cd "${ROOT}"/tmp/usr/bin && ln -s clang ${CHOST}-clang && ln -s clang++ ${CHOST}-clang++ )
+		fi
 	elif ! is-rap ; then
 		# make sure the EPREFIX gcc shared libraries are there
 		mkdir -p "${ROOT}"/usr/${CHOST}/lib/gcc
@@ -1634,7 +1636,7 @@ bootstrap_stage3() {
 		# stage3 tools should be used first.
 		# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
 		# needed with host portage.
-		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/5/}{s,}bin | sed "s, ,:${ROOT},g") \
+		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
 		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0cddd6015439d681bb07ad653de3515f5a66ae9f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  5 17:54:16 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun  5 17:54:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0cddd601

scripts/bootstrap-prefix: ensure we pickup portage right after being emerged

The portage in tmp may not work well with newer python, so ensure that
we don't run that portage anymore once we installed a proper one.

 scripts/bootstrap-prefix.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 75eaf07356..910483897c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1791,18 +1791,19 @@ bootstrap_stage3() {
 	TIME_T_32_BIT_OK=yes \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
+	if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
+		echo "We need openrc-run at ${ROOT}/sbin to merge rsync." > "${ROOT}"/sbin/openrc-run
+		chmod +x "${ROOT}"/sbin/openrc-run
+	fi
+
 	# gettext pulls in portage, which since 2.2.28 needs ssl enabled, so
 	# we need to lift our mask for that.
 	pkgs=(
-		$( [[ ${OFFLINE_MODE} ]] || echo sys-devel/gettext )
-		$( [[ ${OFFLINE_MODE} ]] || echo net-misc/wget )
 		virtual/os-headers
-		sys-apps/portage
+		$( [[ ${OFFLINE_MODE} ]] \
+			&& echo sys-apps/portage \
+			|| echo sys-devel/gettext )
 	)
-	if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
-		echo "We need openrc-run at ${ROOT}/sbin to merge rsync." > "${ROOT}"/sbin/openrc-run
-		chmod +x "${ROOT}"/sbin/openrc-run
-	fi
 	USE="ssl" \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ddf86254b773b1a2205c8ef166c7d8c7fdcfa697
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 11 16:37:47 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 16:37:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ddf86254

scripts/bootstrap-prefix: (try to) workaround libtool stage3 issue

Closes: https://bugs.gentoo.org/655414

 scripts/bootstrap-prefix.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 910483897c..c9debd1bd3 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1541,6 +1541,17 @@ bootstrap_stage2() {
 	EXTRA_ECONF=$(rapx --with-sysroot=/) \
 	emerge_pkgs --nodeps ${linker} || return 1
 
+	# automake and autoconf need to be installed in /tmp in order for
+	# autotools.eclass to run successfully, bug #655414, #657414
+	# rely on Perl from host, let's hope it's there
+	unset PERL
+	if [[ -x $(type -P perl) ]] ; then
+		( cd "${ROOT}"/tmp/usr/bin && ln -s $(type -P perl) )
+		emerge_pkgs --nodeps sys-devel/autoconf sys-devel/automake || return 1
+	else
+		einfo "You don't have perl available, you'll likely run into bug #657414"
+	fi
+
 	# Old versions of gcc has been masked.  We need gcc-4.7 to bootstrap
 	# on systems without a c++ compiler.
 	echo '<sys-devel/gcc-4.8' >> "${ROOT}"/tmp/etc/portage/package.unmask

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8f0a6165ded1aecea9ae4b38f2b6e0eba328c62a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 16:36:20 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 16:36:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8f0a6165

scripts/bootstrap-prefix: clear resume list at end of stage3

To avoid incorrectly resuming some crap from e.g. depclean, make sure we
clear the resume list at the end of stage3, such that we will start with
a clean slate.

 scripts/bootstrap-prefix.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 80c9ebd956..f39daf9b2e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1855,6 +1855,10 @@ bootstrap_stage3() {
 	einfo "running emerge --depclean"
 	emerge --depclean
 
+	# "wipe" mtimedb such that the resume list is proper after this stage
+	# (--depclean may fail, which is ok)
+	sed -i -e 's/resume_backup/cleared/' "${EPREFIX}"/var/cache/edb/mtimedb
+
 	einfo "stage3 successfully finished"
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ad303b8b39778b3466eef1ab9609d904c33e50ed
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 16:34:41 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 16:34:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ad303b8b

scripts/bootstrap-prefix: remove makeinfo hack sooner

seems we always install texinfo these days, so no need for
RAP-conditionals or something, we do need to cleanup before we finish up
system though

 scripts/bootstrap-prefix.sh | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c14d03df7a..80c9ebd956 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1377,7 +1377,9 @@ bootstrap_stage1() {
 
 bootstrap_stage1_log() {
 	bootstrap_stage1 ${@} 2>&1 | tee -a ${ROOT}/stage1.log
-	return ${PIPESTATUS[0]}
+	local ret=${PIPESTATUS[0]}
+	[[ ${ret} == 0 ]] && touch ${ROOT}/.stage1-finished
+	return ${ret}
 }
 
 do_emerge_pkgs() {
@@ -1605,13 +1607,14 @@ bootstrap_stage2() {
 		cp "${ROOT}"/tmp/usr/${CHOST}/lib/gcc/* "${ROOT}"/usr/${CHOST}/lib/gcc
 	fi
 
-	touch "${ROOT}/tmp/.stage2-finished"
 	einfo "stage2 successfully finished"
 }
 
 bootstrap_stage2_log() {
 	bootstrap_stage2 ${@} 2>&1 | tee -a ${ROOT}/stage2.log
-	return ${PIPESTATUS[0]}
+	local ret=${PIPESTATUS[0]}
+	[[ ${ret} == 0 ]] && touch "${ROOT}/.stage2-finished"
+	return ${ret}
 }
 
 bootstrap_stage3() {
@@ -1837,6 +1840,9 @@ bootstrap_stage3() {
 	einfo "running emerge -u1 openssl"
 	CFLAGS= CXXFLAGS= emerge -u1 openssl || return 1
 
+	# remove temp makeinfo, texinfo provides it
+	[[ -f "${ROOT}"/usr/bin/makeinfo ]] && rm -f "${ROOT}"/usr/bin/makeinfo
+
 	# Portage should figure out itself what it needs to do, if anything.
 	# Avoid glib compiling for Cocoa libs if it finds them, since we're
 	# still with an old llvm that may not understand the system headers
@@ -1845,12 +1851,6 @@ bootstrap_stage3() {
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
 	CFLAGS= CXXFLAGS= emerge -u system || return 1
 
-	# remove temp makeinfo, texinfo provides it
-	[[ -f "${ROOT}"/usr/bin/makeinfo ]] && rm -f "${ROOT}"/usr/bin/makeinfo
-
-	# TODO, glibc should depend on texinfo
-	is-rap && { emerge sys-apps/texinfo || return 1; }
-
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"
 	emerge --depclean
@@ -1860,7 +1860,9 @@ bootstrap_stage3() {
 
 bootstrap_stage3_log() {
 	bootstrap_stage3 ${@} 2>&1 | tee -a ${ROOT}/stage3.log
-	return ${PIPESTATUS[0]}
+	local ret=${PIPESTATUS[0]}
+	[[ ${ret} == 0 ]] && touch "${ROOT}/.stage3-finished"
+	return ${ret}
 }
 
 set_helper_vars() {
@@ -2542,8 +2544,7 @@ EOF
 	ROOT="${EPREFIX}"
 	set_helper_vars
 
-	if ! [[ -x ${EPREFIX}/usr/lib/portage/bin/emerge || -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge || -x ${EPREFIX}/tmp/usr/bin/emerge  ]] \
-			&& ! bootstrap_stage1_log ; then
+	if ! [[ -e ${EPREFIX}/.stage1-finished ]] && ! bootstrap_stage1_log ; then
 		# stage 1 fail
 		cat << EOF
 
@@ -2573,11 +2574,7 @@ EOF
 	# deal with the bash-constructs we use in stage3 and onwards
 	hash -r
 
-	# stage 2 on Darwin gets llvm/clang, so we must not get confused
-	# when we find gcc there (it's needed to bootstrap llvm)
-	local compiler=gcc
-	[[ ${CHOST} == *-darwin* ]] && compiler=clang
-	if ! [[ -e ${EPREFIX}/tmp/.stage2-finished ]] \
+	if ! [[ -e ${EPREFIX}/.stage2-finished ]] \
 		&& ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2_log ; then
 		# stage 2 fail
 		cat << EOF
@@ -2604,7 +2601,8 @@ EOF
 	# new bash
 	hash -r
 
-	if ! bash ${BASH_SOURCE[0]} "${EPREFIX}" stage3_log ; then
+	if ! [[ -e ${EPREFIX}/.stage3-finished ]] \
+		&& ! bash ${BASH_SOURCE[0]} "${EPREFIX}" stage3_log ; then
 		# stage 3 fail
 		hash -r  # previous cat (tmp/usr/bin/cat) may have been removed
 		cat << EOF

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ddabaa4788dd956904973e3b5cb1ba57099b8864
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 08:20:05 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 08:20:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ddabaa47

scripts/bootstrap-prefix: simplify and add some logging

don't emerge gettext explicitly, just emerge portage (it seems this
workaround is no longer necessary)

add some logging around emerge steps so it's more visible what is
attempted (and where stuff breaks)

allow resuming the final emerge -e stage (optimistic approach)

 scripts/bootstrap-prefix.sh | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c9debd1bd3..c14d03df7a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1808,12 +1808,10 @@ bootstrap_stage3() {
 	fi
 
 	# gettext pulls in portage, which since 2.2.28 needs ssl enabled, so
-	# we need to lift our mask for that.
+	# we need to lift our mask for that. (USE=ssl)
 	pkgs=(
 		virtual/os-headers
-		$( [[ ${OFFLINE_MODE} ]] \
-			&& echo sys-apps/portage \
-			|| echo sys-devel/gettext )
+		sys-apps/portage
 	)
 	USE="ssl" \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
@@ -1832,15 +1830,20 @@ bootstrap_stage3() {
 		emerge --sync || emerge-webrsync || return 1
 	fi
 
+	# avoid installing git just for fun while completing @system
+	export USE="-git"
+
 	# temporarily work around c_rehash missing openssl dependency, bug #572790
+	einfo "running emerge -u1 openssl"
 	CFLAGS= CXXFLAGS= emerge -u1 openssl || return 1
 
 	# Portage should figure out itself what it needs to do, if anything.
 	# Avoid glib compiling for Cocoa libs if it finds them, since we're
 	# still with an old llvm that may not understand the system headers
 	# very well on Darwin (-DGNUSTEP_BASE_VERSION hack)
+	einfo "running emerge -u system"
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
-	CFLAGS= CXXFLAGS= USE="-git" emerge -u system || return 1
+	CFLAGS= CXXFLAGS= emerge -u system || return 1
 
 	# remove temp makeinfo, texinfo provides it
 	[[ -f "${ROOT}"/usr/bin/makeinfo ]] && rm -f "${ROOT}"/usr/bin/makeinfo
@@ -1849,6 +1852,7 @@ bootstrap_stage3() {
 	is-rap && { emerge sys-apps/texinfo || return 1; }
 
 	# remove anything that we don't need (compilers most likely)
+	einfo "running emerge --depclean"
 	emerge --depclean
 
 	einfo "stage3 successfully finished"
@@ -2624,7 +2628,14 @@ EOF
 		exit 1
 	fi
 
-	if emerge -e system ; then
+	local cmd="emerge -e system"
+	if [[ -e ${EPREFIX}/var/cache/edb/mtimedb ]] && \
+		grep -q resume_backup "${EPREFIX}"/var/cache/edb/mtimedb ;
+	then
+		cmd="emerge --resume"
+	fi
+	einfo "running ${cmd}"
+	if ${cmd} ; then
 		# Now, after 'emerge -e system', we can get rid of the temporary tools.
 		if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then
 			rm -Rf "${EPREFIX}"/tmp || return 1
@@ -2637,7 +2648,7 @@ EOF
 		cat << EOF
 
 Oh yeah, I thought I was almost there, and then this!  I did
-  emerge -e system
+  ${cmd}
 and it failed at some point :(  Details might be found in the build log:
 EOF
 		for log in "${EPREFIX}"/var/tmp/portage/*/*/temp/build.log ; do

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a0944aafa313ec5c87a787f41f7ff7317a4b11d6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 16:38:37 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 16:38:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a0944aaf

scripts/bootstrap-prefix: make FSF gcc the default compiler on ppc-macos

We need (or want) more recent features and standards, and FSF gcc-7
works fine, so use that instead of Clang (which we can't get a recent
version to compile).  Because of sys-libs/csu doing some weird stuff, we
really need gcc-apple for that, but that package got hacked to use it,
the rest is all fine with gcc-7.3.0-r3.

 scripts/bootstrap-prefix.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f39daf9b2e..8483a62149 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -197,7 +197,6 @@ configure_toolchain() {
 					mycc=gcc
 					;;
 				*"(GCC) 4.0.1 "*)
-					# need gcc-4.2.1 to compile llvm
 					linker="=sys-devel/binutils-apple-3.2"
 					compiler_stage1+="
 						${gcc_deps}
@@ -206,12 +205,17 @@ configure_toolchain() {
 						sys-devel/binutils-apple"
 					mycc=gcc
 					;;
+				*"(Gentoo "*)
+					# probably the result of a bootstrap in progress
+					linker=sys-devel/binutils-apple
+					mycc=gcc
+					;;
 				*)
 					eerror "unknown compiler"
 					return 1
 					;;
 			esac
-			compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc-apple"
+			compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc"
 			;;
 		*-darwin*)
 			# for compilers choice, see bug:

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     8207d9c59468ff32600463033821eec20197ca0f
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 13 02:12:17 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jun 14 01:15:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8207d9c5

Regard stage3 as BDEPEND in terms of EAPI7.

  So that build dependencies are satisfied by stage3.

Credit: Paul Preney, Byron Grobe, Stephen McCamant, Horea Christian
Credit: giacomo.cappellini.87, kuzetsa, Kalon Mills, Joey Chagnon
Closes: https://bugs.gentoo.org/655414
Closes: https://bugs.gentoo.org/655326

 scripts/bootstrap-prefix.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7d6a552970..8dd8fb1f33 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -670,6 +670,8 @@ bootstrap_portage() {
 
 	# in Prefix the sed wrapper is deadly, so kill it
 	rm -f "${ROOT}"/tmp/usr/lib/portage/bin/ebuild-helpers/sed
+	# stage3 PATH should come before stage2
+	sed -e '/DEFAULT_PATH/d' -i "${ROOT}"/tmp/usr/share/portage/config/make.globals
 
 	[[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" "${ROOT}"/tmp/usr/portage
 
@@ -1643,7 +1645,7 @@ bootstrap_stage3() {
 		# stage3 tools should be used first.
 		# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
 		# needed with host portage.
-		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
+		PREROOTPATH="${ROOT}"$(echo usr/lib/llvm/{10,9,8,7,6,5}/bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
 		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
@@ -1723,6 +1725,20 @@ bootstrap_stage3() {
 		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	fi
 
+	# Move portage from stage2 to stage3, because build
+	# dependencies are bootstrapped by stage3.  After the
+	# introduction of EAPI-7, eclasses now strictly distinguish
+	# between build dependencies that are binary compatible with
+	# the native build system (CBUILD, BDEPEND) and with the
+	# system being built (CHOST, DEPEND).
+	#
+	# As we don't know the layout of ${ROOT}/usr/lib, do this hack
+	# after baselayout.
+	[[ -d "${ROOT}"/usr/share/portage ]] || cp -a "${ROOT}"{/tmp,}/usr/share/portage
+	[[ -d "${ROOT}"/usr/lib/portage ]] || cp -a "${ROOT}"{/tmp,}/usr/lib/portage
+	cp -f "${ROOT}"/tmp/usr/{bin,lib/portage/bin/ebuild-helpers}/portageq
+	export PORTAGE_OVERRIDE_EPREFIX="${ROOT}"
+
 	# On some hosts, gcc gets confused now when it uses the new linker,
 	# see for instance bug #575480.  While we would like to hide that
 	# linker, we can't since we want the compiler to pick it up.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     28c0f1bbe96262c27bed2a3f880ecd91699fec03
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 14 01:01:27 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jun 14 01:15:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=28c0f1bb

Mask CPATH (c include dir) and LIBRARY_PATH (used by gcc).

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8dd8fb1f33..6761f94788 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2052,6 +2052,8 @@ EOF
 		PKG_CONFIG_PATH \
 		PYTHONPATH \
 		ROOT \
+		CPATH \
+		LIBRARY_PATH \
 	; do
 		# starting on purpose a shell here iso ${!flag} because I want
 		# to know if the shell initialisation files trigger this

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     d531270ee6108b43a7dec0e16fdacd3bbab49da8
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 14 01:02:30 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jun 14 01:15:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d531270e

Keep makeinfo stub until overwritten by the real texinfo.

 scripts/bootstrap-prefix.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6761f94788..98b371e7e8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1849,9 +1849,6 @@ bootstrap_stage3() {
 	einfo "running emerge -u1 openssl"
 	CFLAGS= CXXFLAGS= emerge -u1 openssl || return 1
 
-	# remove temp makeinfo, texinfo provides it
-	[[ -f "${ROOT}"/usr/bin/makeinfo ]] && rm -f "${ROOT}"/usr/bin/makeinfo
-
 	# Portage should figure out itself what it needs to do, if anything.
 	# Avoid glib compiling for Cocoa libs if it finds them, since we're
 	# still with an old llvm that may not understand the system headers

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     3d7eca7b2d1b470efae85b72f9452970a6732f1d
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 14:04:59 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 01:31:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3d7eca7b

As discussed in Bug 655414, no perl from the host should be assumed.

Revert "scripts/bootstrap-prefix: (try to) workaround libtool stage3 issue"

This reverts commit ddf86254b773b1a2205c8ef166c7d8c7fdcfa697.

 scripts/bootstrap-prefix.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8483a62149..7d6a552970 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1547,17 +1547,6 @@ bootstrap_stage2() {
 	EXTRA_ECONF=$(rapx --with-sysroot=/) \
 	emerge_pkgs --nodeps ${linker} || return 1
 
-	# automake and autoconf need to be installed in /tmp in order for
-	# autotools.eclass to run successfully, bug #655414, #657414
-	# rely on Perl from host, let's hope it's there
-	unset PERL
-	if [[ -x $(type -P perl) ]] ; then
-		( cd "${ROOT}"/tmp/usr/bin && ln -s $(type -P perl) )
-		emerge_pkgs --nodeps sys-devel/autoconf sys-devel/automake || return 1
-	else
-		einfo "You don't have perl available, you'll likely run into bug #657414"
-	fi
-
 	# Old versions of gcc has been masked.  We need gcc-4.7 to bootstrap
 	# on systems without a c++ compiler.
 	echo '<sys-devel/gcc-4.8' >> "${ROOT}"/tmp/etc/portage/package.unmask

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     285454817f40abef3e124c31bb751755a0a4139e
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 14 01:04:12 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jun 14 01:15:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=28545481

Work around bug 658060.

 scripts/bootstrap-prefix.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 98b371e7e8..fba87c3662 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -658,6 +658,9 @@ bootstrap_portage() {
 		|| return 1
 	$MAKE ${MAKEOPTS} || return 1
 
+	# bug 658060
+	find . -name __pycache__ -delete
+
  	einfo "Installing ${A%-*}"
 	$MAKE install || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     92402a6be94d25db8bbdf7015eb07c6f019c42e7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 17 14:54:15 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 14:54:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=92402a6b

scripts/bootstrap-prefix: bump portage to fix pycache bug

 scripts/bootstrap-prefix.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fba87c3662..f307bb4f64 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -609,8 +609,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.40.1"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40.1"
+	STABLE_PV="2.3.40.2"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40.2"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"
@@ -658,9 +658,6 @@ bootstrap_portage() {
 		|| return 1
 	$MAKE ${MAKEOPTS} || return 1
 
-	# bug 658060
-	find . -name __pycache__ -delete
-
  	einfo "Installing ${A%-*}"
 	$MAKE install || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fa5da1565514d2a7d13301f5ba8ce4b1478a7b9e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 08:45:33 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 08:45:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fa5da156

scripta/bootstrap-prefix: bump tree snapshot

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f307bb4f64..14e72715d1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180530"
+	local PV="20180617"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7d1ffcb774642284063a90819015ea3c99f92b74
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 07:22:46 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 07:22:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7d1ffcb7

scripts/bootstrap-prefix: drop temp workaround for openssl

 scripts/bootstrap-prefix.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 14e72715d1..c746590e22 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1845,10 +1845,6 @@ bootstrap_stage3() {
 	# avoid installing git just for fun while completing @system
 	export USE="-git"
 
-	# temporarily work around c_rehash missing openssl dependency, bug #572790
-	einfo "running emerge -u1 openssl"
-	CFLAGS= CXXFLAGS= emerge -u1 openssl || return 1
-
 	# Portage should figure out itself what it needs to do, if anything.
 	# Avoid glib compiling for Cocoa libs if it finds them, since we're
 	# still with an old llvm that may not understand the system headers

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     ce515e60309e2e2c51577410b111209eec5754d0
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 12:02:37 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 12:02:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ce515e60

bootstrap-prefix.sh: apply 'stacked-prefix' patch

Introducing the 'stacked-prefix' portage FEATURE via temporary patch,
subject to be dropped from bootstrap-prefix.sh script once integrated.

This replaces commit 8207d9c59468ff32600463033821eec20197ca0f.

Closes: https://bugs.gentoo.org/655326
Closes: https://bugs.gentoo.org/655414

 scripts/bootstrap-prefix.sh | 71 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9c1daa7775..8ba7586747 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -627,6 +627,72 @@ bootstrap_portage() {
 	S="${S}/prefix-portage-${PV}"
 	cd "${S}"
 
+	# patch temporary included here: fail when it should be dropped
+	mkdir -p "${ROOT}"/etc/portage/patches/sys-apps/portage || return 1
+	cat > "${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch <<'EOP'
+From 902fad63990eb4516d3e3815994b2dcbd16155fd Mon Sep 17 00:00:00 2001
+From: Michael Haubenwallner <haubi@gentoo.org>
+Date: Tue, 19 Jun 2018 16:39:12 +0200
+Subject: [PATCH] introduce the 'stacked-prefix' FEATURE
+
+When we merge into another EPREFIX, but not into some ROOT,
+and CHOST is equal to CBUILD, build tools found in EPREFIX
+perfectly work for the current build environment.
+In a "stacked prefix" we explicitly utilize this situation.
+
+This is useful during prefix bootstrap (#655414, #655326), but also to
+build packages for targets unable to support the full portage toolchain
+(native Windows, MinGW), but otherwise do not require a full cross
+compilation setup.
+---
+ bin/phase-helpers.sh | 14 ++++++++++++++
+ pym/portage/const.py |  1 +
+ 2 files changed, 15 insertions(+)
+
+diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
+index c32533fb3..fea2362cf 100644
+--- a/bin/phase-helpers.sh
++++ b/bin/phase-helpers.sh
+@@ -927,6 +927,20 @@ ___best_version_and_has_version_common() {
+ 			fi ;;
+ 	esac
+ 
++	if ___eapi_has_prefix_variables         &&
++	   has "${root_arg}" '--host-root' '-b' &&
++	   has stacked-prefix ${FEATURES}       &&
++	   [[ -z ${ROOT%/} ]]                   &&
++	   [[ ${CBUILD} == ${CHOST} ]]          &&
++	   [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
++	:; then
++		# When we merge into another EPREFIX, but not into some ROOT,
++		# and CHOST is equal to CBUILD, build tools found in EPREFIX
++		# perfectly work for the current build environment.
++		# In a "stacked prefix" we explicitly utilize this situation.
++		"${FUNCNAME[1]}" "${atom}" && return 0
++	fi
++
+ 	if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
+ 		cmd+=("${PORTAGE_BIN_PATH}"/ebuild-ipc "${FUNCNAME[1]}" "${root}" "${atom}")
+ 	else
+diff --git a/pym/portage/const.py b/pym/portage/const.py
+index a3d927c3b..ed54425b5 100644
+--- a/pym/portage/const.py
++++ b/pym/portage/const.py
+@@ -204,6 +204,7 @@ SUPPORTED_FEATURES       = frozenset([
+ 	"splitdebug",
+ 	"split-elog",
+ 	"split-log",
++	"stacked-prefix",
+ 	"strict",
+ 	"strict-keepdir",
+ 	"stricter",
+-- 
+2.16.1
+
+EOP
+	[[ $? -eq 0 ]] || return 1
+	patch -p1 < "${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch || return 1
+
 	# >=2.3
 	[[ -r bin/repoman ]] || sed -i -e '/repoman/d' {man,bin}/Makefile.in
 
@@ -1645,7 +1711,7 @@ bootstrap_stage3() {
 		# needed with host portage.
 		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
-		FEATURES="${FEATURES} force-prefix" \
+		FEATURES="${FEATURES} force-prefix stacked-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
 		do_emerge_pkgs "$@"
 	}
@@ -1812,6 +1878,9 @@ bootstrap_stage3() {
 	USE="ssl" \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
+	# patch temporary included here: fail when it should be dropped
+	rm "${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch || return 1
+
 	# Switch to the proper portage.
 	hash -r
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     d81bebc842bfb88532c69c70f45bcf347d6fc15b
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 12:02:00 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 12:02:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d81bebc8

Revert "Regard stage3 as BDEPEND in terms of EAPI7."

This reverts commit 8207d9c59468ff32600463033821eec20197ca0f.

 scripts/bootstrap-prefix.sh | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c746590e22..9c1daa7775 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -670,8 +670,6 @@ bootstrap_portage() {
 
 	# in Prefix the sed wrapper is deadly, so kill it
 	rm -f "${ROOT}"/tmp/usr/lib/portage/bin/ebuild-helpers/sed
-	# stage3 PATH should come before stage2
-	sed -e '/DEFAULT_PATH/d' -i "${ROOT}"/tmp/usr/share/portage/config/make.globals
 
 	[[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" "${ROOT}"/tmp/usr/portage
 
@@ -1645,7 +1643,7 @@ bootstrap_stage3() {
 		# stage3 tools should be used first.
 		# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
 		# needed with host portage.
-		PREROOTPATH="${ROOT}"$(echo usr/lib/llvm/{10,9,8,7,6,5}/bin | sed "s, ,:${ROOT},g") \
+		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
 		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
@@ -1725,20 +1723,6 @@ bootstrap_stage3() {
 		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	fi
 
-	# Move portage from stage2 to stage3, because build
-	# dependencies are bootstrapped by stage3.  After the
-	# introduction of EAPI-7, eclasses now strictly distinguish
-	# between build dependencies that are binary compatible with
-	# the native build system (CBUILD, BDEPEND) and with the
-	# system being built (CHOST, DEPEND).
-	#
-	# As we don't know the layout of ${ROOT}/usr/lib, do this hack
-	# after baselayout.
-	[[ -d "${ROOT}"/usr/share/portage ]] || cp -a "${ROOT}"{/tmp,}/usr/share/portage
-	[[ -d "${ROOT}"/usr/lib/portage ]] || cp -a "${ROOT}"{/tmp,}/usr/lib/portage
-	cp -f "${ROOT}"/tmp/usr/{bin,lib/portage/bin/ebuild-helpers}/portageq
-	export PORTAGE_OVERRIDE_EPREFIX="${ROOT}"
-
 	# On some hosts, gcc gets confused now when it uses the new linker,
 	# see for instance bug #575480.  While we would like to hide that
 	# linker, we can't since we want the compiler to pick it up.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b568bd569a6cd44c280ea066ecdf50d619bd1eee
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 06:56:12 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 06:56:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b568bd56

scripts/bootstrap-prefix: bump snapshot

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8f0d61ea09..5440b54289 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180617"
+	local PV="20180620"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     9ff91cd60df019c1b008bdafcd32aac9e5811d5f
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 13:41:30 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 13:44:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9ff91cd6

bootstrap-prefix.sh: only tmp portage really needs the stacked-prefix patch

There is no need to put it into etc/portage/patches/sys-apps/portage/,
because when portage itself is merged in stage3, everything's there.

 scripts/bootstrap-prefix.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5440b54289..046a7918d0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -628,8 +628,7 @@ bootstrap_portage() {
 	cd "${S}"
 
 	# patch temporary included here: fail when it should be dropped
-	mkdir -p "${ROOT}"/etc/portage/patches/sys-apps/portage || return 1
-	cat > "${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch <<'EOP'
+	patch -p1 <<'EOP'
 From 902fad63990eb4516d3e3815994b2dcbd16155fd Mon Sep 17 00:00:00 2001
 From: Michael Haubenwallner <haubi@gentoo.org>
 Date: Tue, 19 Jun 2018 16:39:12 +0200
@@ -691,7 +690,6 @@ index a3d927c3b..ed54425b5 100644
 
 EOP
 	[[ $? -eq 0 ]] || return 1
-	patch -p1 < "${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch || return 1
 
 	# >=2.3
 	[[ -r bin/repoman ]] || sed -i -e '/repoman/d' {man,bin}/Makefile.in
@@ -1876,9 +1874,6 @@ bootstrap_stage3() {
 	USE="ssl" \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
-	# patch temporary included here: fail when it should be dropped
-	rm "${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch || return 1
-
 	# Switch to the proper portage.
 	hash -r
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a07b63e84557a8ad4b83776252c947c1abffccd1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 18:39:43 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 18:39:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a07b63e8

scripts/bootstrap-prefix: bump snapshots, cleanup

 scripts/bootstrap-prefix.sh | 73 ++-------------------------------------------
 1 file changed, 3 insertions(+), 70 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 046a7918d0..07695383bf 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180620"
+	local PV="20180629"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -609,8 +609,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.40.2"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40.2"
+	STABLE_PV="2.3.40.3"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40.3"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"
@@ -627,73 +627,6 @@ bootstrap_portage() {
 	S="${S}/prefix-portage-${PV}"
 	cd "${S}"
 
-	# patch temporary included here: fail when it should be dropped
-	patch -p1 <<'EOP'
-From 902fad63990eb4516d3e3815994b2dcbd16155fd Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <haubi@gentoo.org>
-Date: Tue, 19 Jun 2018 16:39:12 +0200
-Subject: [PATCH] introduce the 'stacked-prefix' FEATURE
-
-When we merge into another EPREFIX, but not into some ROOT,
-and CHOST is equal to CBUILD, build tools found in EPREFIX
-perfectly work for the current build environment.
-In a "stacked prefix" we explicitly utilize this situation.
-
-This is useful during prefix bootstrap (#655414, #655326), but also to
-build packages for targets unable to support the full portage toolchain
-(native Windows, MinGW), but otherwise do not require a full cross
-compilation setup.
----
- bin/phase-helpers.sh | 14 ++++++++++++++
- pym/portage/const.py |  1 +
- 2 files changed, 15 insertions(+)
-
-diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
-index c32533fb3..fea2362cf 100644
---- a/bin/phase-helpers.sh
-+++ b/bin/phase-helpers.sh
-@@ -927,6 +927,20 @@ ___best_version_and_has_version_common() {
- 			fi ;;
- 	esac
- 
-+	if ___eapi_has_prefix_variables         &&
-+	   has "${root_arg}" '--host-root' '-b' &&
-+	   has stacked-prefix ${FEATURES}       &&
-+	   [[ -z ${ROOT%/} ]]                   &&
-+	   [[ ${CBUILD} == ${CHOST} ]]          &&
-+	   [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
-+	:; then
-+		# When we merge into another EPREFIX, but not into some ROOT,
-+		# and CHOST is equal to CBUILD, build tools found in EPREFIX
-+		# perfectly work for the current build environment.
-+		# In a "stacked prefix" we explicitly utilize this situation.
-+		"${FUNCNAME[1]}" "${atom}" && return 0
-+	fi
-+
- 	if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
- 		cmd+=("${PORTAGE_BIN_PATH}"/ebuild-ipc "${FUNCNAME[1]}" "${root}" "${atom}")
- 	else
-diff --git a/pym/portage/const.py b/pym/portage/const.py
-index a3d927c3b..ed54425b5 100644
---- a/pym/portage/const.py
-+++ b/pym/portage/const.py
-@@ -204,6 +204,7 @@ SUPPORTED_FEATURES       = frozenset([
- 	"splitdebug",
- 	"split-elog",
- 	"split-log",
-+	"stacked-prefix",
- 	"strict",
- 	"strict-keepdir",
- 	"stricter",
--- 
-2.16.1
-
-EOP
-	[[ $? -eq 0 ]] || return 1
-
-	# >=2.3
-	[[ -r bin/repoman ]] || sed -i -e '/repoman/d' {man,bin}/Makefile.in
-
 	# disable ipc
 	sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
 		-i pym/_emerge/AbstractEbuildProcess.py || \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     71be4aab42ffdfbe2177b1ba6639f9bf935251f7
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 08:25:00 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 08:25:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=71be4aab

scripts/bootstrap-prefix.sh: improve the fake makeinfo.

  In the glibc build,

    makeinfo -P <dir> --output=libc.info libc.texinfo

  is called and we should ignore -P.

Credit: huiyiqun

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 07695383bf..ad21815f9e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1648,14 +1648,14 @@ bootstrap_stage3() {
 
 	# GCC sometimes decides that it needs to run makeinfo to update some
 	# info pages from .texi files.  Obviously we don't care at this
-	# stage and rather have it continue instead of abort the build
+	# stage and rather have it continue instead of aborting the build
 	[[ -x "${ROOT}"/usr/bin/makeinfo ]] || cat > "${ROOT}"/usr/bin/makeinfo <<-EOF
 		#!${ROOT}/bin/bash
 		echo "makeinfo GNU texinfo 4.13"
 		for a in \$@; do
 		case \$a in
 		--*) f=\$(echo "\$a" | sed -r 's,--.*=(.*),\1,') ;;
-		-*) ;;
+		-*) continue ;;
 		*) f=\$a ;;
 		esac
 		[[ -e \$f ]] || touch \$f

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b4de28372738f421ce5b0b808bcb82b5d6021ab4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 19 08:34:10 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug 19 08:34:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b4de2837

scripts/bootstrap-prefix: add workaround instructions for download problems

 scripts/bootstrap-prefix.sh | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ad21815f9e..bb25d293de 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2561,6 +2561,7 @@ EOF
 	# deal with the bash-constructs we use in stage3 and onwards
 	hash -r
 
+	local https_needed=no
 	if ! [[ -e ${EPREFIX}/.stage2-finished ]] \
 		&& ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2_log ; then
 		# stage 2 fail
@@ -2573,14 +2574,23 @@ EOF
 		for log in "${EPREFIX}"{/tmp,}/var/tmp/portage/*/*/temp/build.log ; do
 			[[ -e ${log} ]] || continue
 			echo "  ${log}"
+			grep -q "HTTPS support not compiled in" "${log}" && https_needed=yes
 		done
 		[[ -e ${log} ]] || echo "  (no build logs found?!?)"
+		if [[ ${https_needed} == "yes" ]] ; then
+			cat << EOF
+It seems one of your logs indicates a download problem due to missing
+HTTPS support.  If this appears to be the problem for real, you can work
+around this for now by downloading the file manually and placing it in
+  "${EPREFIX}"/usr/portage/distfiles
+I will find it when you run me again.  If this is NOT the problem, then
+EOF
+		fi
 		cat << EOF
 I have no clue, really.  Please find friendly folks in #gentoo-prefix on
 irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, or file a bug
-at bugs.gentoo.org under Gentoo/Alt, Prefix Support. I am defeated.
-I am of no use here any more.
-Maybe you can find some clues in ${EPREFIX}/stage2.log
+at bugs.gentoo.org under Gentoo/Alt, Prefix Support.
+Remember you might find some clues in ${EPREFIX}/stage2.log
 EOF
 		exit 1
 	fi
@@ -2601,8 +2611,18 @@ EOF
 		for log in "${EPREFIX}"{/tmp,}/var/tmp/portage/*/*/temp/build.log ; do
 			[[ -e ${log} ]] || continue
 			echo "  ${log}"
+			grep -q "HTTPS support not compiled in" "${log}" && https_needed=yes
 		done
 		[[ -e ${log} ]] || echo "  (no build logs found?!?)"
+		if [[ ${https_needed} == "yes" ]] ; then
+			cat << EOF
+It seems one of your logs indicates a download problem due to missing
+HTTPS support.  If this appears to be the problem for real, you can work
+around this for now by downloading the file manually and placing it in
+  "${EPREFIX}"/usr/portage/distfiles
+I will find it when you run me again.  If this is NOT the problem, then
+EOF
+		fi
 		cat << EOF
 I have no clue, really.  Please find friendly folks in #gentoo-prefix on
 irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, or file a bug

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     413545cbf257d578db2d9bbc787f049be94542a1
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  5 15:28:13 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Oct  5 15:28:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=413545cb

bootstrap-prefix.sh (stage1): bump to Python-2.7.15.tar.xz for AIX

 scripts/bootstrap-prefix.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bb25d293de..dc3f37bf78 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -832,7 +832,8 @@ bootstrap_python() {
 	case $CHOST in
 		*-*-aix*)
 			# TODO: freebsd 10 also seems to need this
-			A=Python-${PV}.tar.bz2 # patched one breaks
+			PV=2.7.15
+			A=Python-${PV}.tar.xz # patched one breaks
 			patch=true
 		;;
 		*)
@@ -852,7 +853,12 @@ bootstrap_python() {
 	rm -rf "${S}"
 	mkdir -p "${S}"
 	cd "${S}"
-	bzip2 -dc "${DISTDIR}"/${A} | tar -xf - || return 1
+	case ${A} in
+	*bz2) bzip2 -dc "${DISTDIR}"/${A} | tar -xf - ;;
+	*xz) xz -dc "${DISTDIR}"/${A} | tar -xf - ;;
+	*) einfo "Don't know to unpack ${A}" ;;
+	esac
+	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/Python-${PV}
 	cd "${S}"
 	rm -rf Modules/_ctypes/libffi* || return 1
@@ -861,7 +867,7 @@ bootstrap_python() {
 	if ${patch}; then
 		# This patch is critical and needs to be applied even
 		# when using the otherwise unpatched sources.
-		efetch "http://dev.gentoo.org/~redlizard/distfiles/02_all_disable_modules_and_ssl.patch"
+		efetch "http://dev.gentoo.org/~haubi/distfiles/02_all_disable_modules_and_ssl.patch"
 		patch -p0 < "${DISTDIR}"/02_all_disable_modules_and_ssl.patch
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7b447d8c44a11f40342d312ffa3e0ab2b06b12cf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 20 08:37:16 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Nov 20 08:37:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7b447d8c

scripts/bootstrap-prefix: support macOS 10.14 Mojave (darwin18)

Bug: https://bugs.gentoo.org/671546
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index dc3f37bf78..cdcb8346d1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -384,11 +384,11 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
-		i*86-apple-darwin1[01234567])
+		i*86-apple-darwin1[012345678])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
-		x86_64-apple-darwin9|x86_64-apple-darwin1[01234567])
+		x86_64-apple-darwin9|x86_64-apple-darwin1[012345678])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f81e23a7667ec3a0ed4b2af80c611be1b2d4d6d5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 14:27:49 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 14:27:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f81e23a7

scripts/bootstrap-prefix: add some dep-cycle workarounds from Sam Pfeiffer

Basically implements Error 1 from
https://pad.crans.org/p/gentoo-prefix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cdcb8346d1..c4f8f18bb7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1553,9 +1553,21 @@ bootstrap_stage2() {
 	# on systems without a c++ compiler.
 	echo '<sys-devel/gcc-4.8' >> "${ROOT}"/tmp/etc/portage/package.unmask
 	
-	# cmake has some external dependencies which require autoconf, etc.
-	# unless we only build the buildtool, bug #603012
-	echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
+
+	# kill some dependencies here while we're still fragile
+	{
+		# cmake has some external dependencies which require autoconf, etc.
+		# unless we only build the buildtool, bug #603012
+		echo "dev-util/cmake -server"
+		# avoid sys-apps/acl -> attr -> gettext cycle on Linux
+		echo "sys-devel/gettext -acl"
+		# gdbm depends on berkdb by default, which pulls in binutils
+		echo "dev-lang/perl -gdbm -berkdb"
+		# package needs perl, nls pulls in specific package
+		echo "sys-apps/help2man -nls"
+		# avoid hefty set of deps from glib
+		echo "dev-util/pkgconfig internal-glib"
+	} >> "${ROOT}"/tmp/etc/portage/package.use
 
 	for pkg in ${compiler_stage1} ; do
 		# <glibc-2.5 does not understand .gnu.hash, use

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     176474015629820885e44ca1a26142978114e31e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 07:12:50 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 07:12:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=17647401

scripts/bootstrap-prefix: bump bootstrap snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c4f8f18bb7..8845fa889a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20180629"
+	local PV="20181211"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     df2b752e05c2480551b4771ecae96cfedc9703f9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 07:16:09 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 07:16:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=df2b752e

scripts/bootstrap-prefix: fix bootstrap on Solaris

This allows to complete the bootstrap on x86-solaris

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8845fa889a..9335fb6661 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1567,6 +1567,9 @@ bootstrap_stage2() {
 		echo "sys-apps/help2man -nls"
 		# avoid hefty set of deps from glib
 		echo "dev-util/pkgconfig internal-glib"
+		# libffi-3.0_rc0 has broken Solaris ld support, which we still
+		# use at this stage (host compiler)
+		[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0"
 	} >> "${ROOT}"/tmp/etc/portage/package.use
 
 	for pkg in ${compiler_stage1} ; do

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e477fc65969ca0841cb8bca657bc364a2e5ba965
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 07:50:25 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 07:50:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e477fc65

scripts/bootstrap-prefix: apply masks before emerging

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9335fb6661..9e08be65f6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1543,16 +1543,14 @@ bootstrap_stage2() {
 		sys-devel/binutils-config
 	)
 
-	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
-	
-	# Debian multiarch supported by RAP needs ld to support sysroot.
-	EXTRA_ECONF=$(rapx --with-sysroot=/) \
-	emerge_pkgs --nodeps ${linker} || return 1
-
 	# Old versions of gcc has been masked.  We need gcc-4.7 to bootstrap
 	# on systems without a c++ compiler.
 	echo '<sys-devel/gcc-4.8' >> "${ROOT}"/tmp/etc/portage/package.unmask
-	
+
+	# libffi-3.0_rc0 has broken Solaris ld support, which we still
+	# use at this stage (host compiler)
+	[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \
+		>> "${ROOT}"/tmp/etc/portage/package.mask
 
 	# kill some dependencies here while we're still fragile
 	{
@@ -1567,11 +1565,14 @@ bootstrap_stage2() {
 		echo "sys-apps/help2man -nls"
 		# avoid hefty set of deps from glib
 		echo "dev-util/pkgconfig internal-glib"
-		# libffi-3.0_rc0 has broken Solaris ld support, which we still
-		# use at this stage (host compiler)
-		[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0"
 	} >> "${ROOT}"/tmp/etc/portage/package.use
 
+	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+
+	# Debian multiarch supported by RAP needs ld to support sysroot.
+	EXTRA_ECONF=$(rapx --with-sysroot=/) \
+	emerge_pkgs --nodeps ${linker} || return 1
+
 	for pkg in ${compiler_stage1} ; do
 		# <glibc-2.5 does not understand .gnu.hash, use
 		# --hash-style=both to produce also sysv hash.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8d816722f92fde69babe626ba91cc0566cb7ee9d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 10:28:58 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 10:28:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8d816722

scripts/bootstrap-prefix: bump bootstrap snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9e08be65f6..74395071ec 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20181211"
+	local PV="20181215"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     d9a8a3922164ccd23d037302d7335b955c173927
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 12:40:39 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 10:31:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d9a8a392

scripts/bootstrap-prefix.sh: portage library into python search path

  Otherwise PYTHONPATH is needed for both portageq and emerge.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 74395071ec..c358c0955e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -669,6 +669,10 @@ bootstrap_portage() {
 	rm -f "${ROOT}"/tmp/usr/lib/portage/bin/ebuild-helpers/sed
 
 	[[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" "${ROOT}"/tmp/usr/portage
+	for d in "${ROOT}"/tmp/usr/lib/python?.?; do
+		[[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/pym/portage ${d}/portage
+		[[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/pym/_emerge ${d}/_emerge
+	done
 
 	if [[ -s ${PORTDIR}/profiles/repo_name ]]; then
 		# sync portage's repos.conf with the tree being used
@@ -1463,7 +1467,6 @@ do_emerge_pkgs() {
 			PORTAGE_CONFIGROOT="${EPREFIX}" \
 			PORTAGE_SYNC_STALE=0 \
 			FEATURES="-news ${FEATURES}" \
-			PYTHONPATH="${ROOT}"/tmp/usr/lib/portage/pym \
 			USE="${myuse[*]}" \
 			emerge -v --oneshot --root-deps ${opts} "${pkg}" 
 		)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     83c39c9620ec89e1eefd8c0a19d38ad3719e5e81
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 10:26:10 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 10:32:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=83c39c96

scripts/bootstrap-prefix.sh: patch stage2 portage.

  Prevent fork loop of portageq, as committed in,
  https://gitweb.gentoo.org/proj/portage.git/commit/?id=daeb75b345c4433218ab9e7a5319e8914092f048

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 95b884ec6b..ccde89e863 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -627,6 +627,11 @@ bootstrap_portage() {
 	S="${S}/prefix-portage-${PV}"
 	cd "${S}"
 
+	# https://github.com/gentoo/portage/pull/389
+	sed -e 's,\${PORTAGE_OVERRIDE_EPREFIX}/usr/lib\*/portage/\*,\*/portage/\*/ebuild-helpers\*,' \
+		-i bin/ebuild-helpers/portageq || \
+		return 1
+
 	# disable ipc
 	sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
 		-i pym/_emerge/AbstractEbuildProcess.py || \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     1c67aca44e46c65645dd16f2ccfcc0d2fced431b
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 10:28:22 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 10:32:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1c67aca4

scripts/bootstrap-prefix.sh: fix portage PATH.

  backport of
  https://gitweb.gentoo.org/proj/portage.git/commit/?id=1b5edbb5ec70f1ae95b8f538a02037bb9a1ded9f

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 112 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ccde89e863..fbaed65070 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -602,6 +602,118 @@ prepare_portage() {
 	mkdir -p "${ROOT}"/bin/. "${ROOT}"/var/log
 	[[ -x ${ROOT}/bin/bash ]] || ln -s "${ROOT}"{/tmp,}/bin/bash || return 1
 	[[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1
+
+	# remove me after Bug 585986
+	mkdir -p "${ROOT}"/etc/portage/patches/sys-apps/portage-2.3.52
+	cat > "${ROOT}"/etc/portage/patches/sys-apps/portage-2.3.52/path.patch <<EOP
+From 1b5edbb5ec70f1ae95b8f538a02037bb9a1ded9f Mon Sep 17 00:00:00 2001
+From: Benda Xu <heroxbd@gentoo.org>
+Date: Thu, 13 Dec 2018 16:53:16 +0800
+Subject: _doebuild_path: do not use host PATH by default and prepend EPREFIX
+ PATH.
+
+  EPREFIX could be overridden in cross-eprefix, in that case tools
+  inside EPREFIX should be prioritized.
+
+  Link necessary binary tools to the test environment.
+
+Bug: https://bugs.gentoo.org/585986
+Closes: https://github.com/gentoo/portage/pull/387
+Signed-off-by: Zac Medico <zmedico@gentoo.org>
+---
+ lib/portage/package/ebuild/doebuild.py           |  9 ++++---
+ lib/portage/tests/resolver/ResolverPlayground.py | 34 ++++++++++++++++++++++++
+ 2 files changed, 39 insertions(+), 4 deletions(-)
+
+diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py
+index 5da9c9503..47c69967c 100644
+--- a/lib/portage/package/ebuild/doebuild.py
++++ b/lib/portage/package/ebuild/doebuild.py
+@@ -211,7 +211,6 @@ def _doebuild_path(settings, eapi=None):
+ 	if portage_bin_path[0] != portage.const.PORTAGE_BIN_PATH:
+ 		# Add a fallback path for restarting failed builds (bug 547086)
+ 		portage_bin_path.append(portage.const.PORTAGE_BIN_PATH)
+-	eprefix = portage.const.EPREFIX
+ 	prerootpath = [x for x in settings.get("PREROOTPATH", "").split(":") if x]
+ 	rootpath = [x for x in settings.get("ROOTPATH", "").split(":") if x]
+ 	rootpath_set = frozenset(rootpath)
+@@ -219,9 +218,10 @@ def _doebuild_path(settings, eapi=None):
+ 		"__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x]
+ 
+ 	prefixes = []
+-	if eprefix:
+-		prefixes.append(eprefix)
+-	prefixes.append("/")
++	# settings["EPREFIX"] should take priority over portage.const.EPREFIX
++	if portage.const.EPREFIX != settings["EPREFIX"] and settings["ROOT"] == os.sep:
++		prefixes.append(settings["EPREFIX"])
++	prefixes.append(portage.const.EPREFIX)
+ 
+ 	path = overrides
+ 
+@@ -245,6 +245,7 @@ def _doebuild_path(settings, eapi=None):
+ 	path.extend(prerootpath)
+ 
+ 	for prefix in prefixes:
++		prefix = prefix if prefix else "/"
+ 		for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
+ 			# Respect order defined in ROOTPATH
+ 			x_abs = os.path.join(prefix, x)
+diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py
+index e2e061669..3997ad26e 100644
+--- a/lib/portage/tests/resolver/ResolverPlayground.py
++++ b/lib/portage/tests/resolver/ResolverPlayground.py
+@@ -10,6 +10,7 @@ from portage import os
+ from portage import shutil
+ from portage.const import (GLOBAL_CONFIG_PATH, PORTAGE_BASE_PATH,
+ 	USER_CONFIG_PATH)
++from portage.process import find_binary
+ from portage.dep import Atom, _repo_separator
+ from portage.package.ebuild.config import config
+ from portage.package.ebuild.digestgen import digestgen
+@@ -76,6 +77,39 @@ class ResolverPlayground(object):
+ 		self.debug = debug
+ 		if eprefix is None:
+ 			self.eprefix = normalize_path(tempfile.mkdtemp())
++
++			# EPREFIX/bin is used by fake true_binaries. Real binaries goes into EPREFIX/usr/bin
++			eubin = os.path.join(self.eprefix, "usr", "bin")
++			ensure_dirs(eubin)
++			essential_binaries = (
++				"awk",
++				"basename",
++				"bzip2",
++				"cat",
++				"chmod",
++				"chown",
++				"cp",
++				"egrep",
++				"env",
++				"find",
++				"grep",
++				"head",
++				"install",
++				"ln",
++				"mkdir",
++				"mktemp",
++				"mv",
++				"rm",
++				"sed",
++				"sort",
++				"tar",
++				"tr",
++				"uname",
++				"uniq",
++				"xargs",
++			)
++			for x in essential_binaries:
++				os.symlink(find_binary(x), os.path.join(eubin, x))
+ 		else:
+ 			self.eprefix = normalize_path(eprefix)
+ 
+-- 
+cgit v1.2.1
+EOP
 }
 
 bootstrap_portage() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     72584272b498433f13d5cc23f3ea83f3d5691535
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 13:21:20 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 10:31:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=72584272

scripts/bootstrap-prefix.sh: bootstrap with make-4.2.1

  glibc-2.28 requires >=make-4.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c358c0955e..b7f1815e52 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1137,7 +1137,7 @@ bootstrap_tar() {
 
 bootstrap_make() {
 	MAKEOPTS= # no GNU make yet
-	bootstrap_gnu make 3.82
+	bootstrap_gnu make 4.2.1
 	if [[ ${MAKE} == gmake ]] ; then
 		# make make available as gmake
 		( cd ${ROOT}/tmp/usr/bin && ln -s make gmake )
@@ -1270,7 +1270,7 @@ bootstrap_stage1() {
 	# packages following (e.g. zlib builds 64-bits)
 
 	# don't rely on $MAKE, if make == gmake packages that call 'make' fail
-	[[ $(make --version 2>&1) == *GNU* ]] || (bootstrap_make) || return 1
+	[[ $(make --version 2>&1) == *GNU" Make "4* ]] || (bootstrap_make) || return 1
 	[[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null || (bootstrap_wget) || return 1
 	[[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1
 	[[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     a6f69ff45bbbb8b7207569220060a2662c0cb9a7
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 13:43:53 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 10:32:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a6f69ff4

scripts/bootstrap-prefix.sh: move portage from stage2 to 3.

  AS a rework of 8207d9c59468ff32600463033, this is only applied to
  prefix-standalone.

Bug: https://bugs.gentoo.org/655414
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 24dfac2e61..95b884ec6b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1664,9 +1664,17 @@ bootstrap_stage3() {
 		# stage3 tools should be used first.
 		# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
 		# needed with host portage.
+		#
+		# After the introduction of EAPI-7, eclasses now
+		# strictly distinguish between build dependencies that
+		# are binary compatible with the native build system
+		# (CBUILD, BDEPEND) and with the system being built
+		# (CHOST, RDEPEND).  To correctly bootstrap stage3,
+		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
 		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
-		FEATURES="${FEATURES} force-prefix stacked-prefix" \
+		PORTAGE_OVERRIDE_EPREFIX="$(rapx "${ROOT}" "${ROOT}/tmp")" \
+		FEATURES="${FEATURES} force-prefix $(rapx "" stacked-prefix)" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
 		do_emerge_pkgs "$@"
 	}
@@ -1690,6 +1698,13 @@ bootstrap_stage3() {
 	export INSTALL_INFO="${ROOT}"/usr/bin/makeinfo
 
 	if is-rap ; then
+		# Bug 655414. Copy portage global config from stage2
+		# to stage3.
+		if [[ ! -d "${ROOT}"/usr/share/portage ]]; then
+			mkdir -p "${ROOT}"/usr/share
+			cp -a "${ROOT}"{/tmp,}/usr/share/portage
+		fi
+
 		# We need ${ROOT}/usr/bin/perl to merge glibc.
 		if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then
 			# trick "perl -V:apiversion" check of glibc-2.19.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     0512c960bb1d9afde8701c640fdc5069d9b8dc50
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 13:43:09 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 10:31:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0512c960

scripts/bootstrap-prefix.sh: explicitly install gettext.

  It is no longer a dependency of portage.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b7f1815e52..24dfac2e61 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1827,6 +1827,7 @@ bootstrap_stage3() {
 	# we need to lift our mask for that. (USE=ssl)
 	pkgs=(
 		virtual/os-headers
+		sys-devel/gettext
 		sys-apps/portage
 	)
 	USE="ssl" \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3ab261a36daa5a0b111a191041bfed629a8f399d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 11:50:08 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 11:53:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3ab261a3

scripts/bootstrap-prefix.sh: allow direct rsync in bootstrap_tree

To test bootstrapping on a more recent tree than the latest snapshot,
allow special TREE_FROM_SRC envvar to specify the source to rsync after
unpacking a snapshot.  This is intended for bootstrap testing only,
normal usage should never use this, hence the support being a bit
brittle.  The exit code of this additional rsync step is ignored.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fbaed65070..48ac9628de 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -543,6 +543,15 @@ bootstrap_tree() {
 	else
 		do_tree http://dev.gentoo.org/~grobian/distfiles prefix-overlay-${PV}.tar.bz2
 	fi
+	local ret=$?
+	if [[ -n ${TREE_FROM_SRC} ]]; then
+		rsync -av --delete \
+			--exclude=.unpacked \
+			--exclude=distfiles \
+			--exclude=snapshots \
+			"${TREE_FROM_SRC}"/ "${PORTDIR}"/
+	fi
+	return $ret
 }
 
 bootstrap_startscript() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     db21e605a0f4824c6fbbe50626c28de2d375100d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 13:00:04 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 13:00:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=db21e605

scripts/bootstrap-prefix.sh: remove recentely added cruft

Instead of adding patches and workarounds, just bump bootstrap portage
version.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 127 ++------------------------------------------
 1 file changed, 5 insertions(+), 122 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 48ac9628de..5440efe94a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -611,118 +611,6 @@ prepare_portage() {
 	mkdir -p "${ROOT}"/bin/. "${ROOT}"/var/log
 	[[ -x ${ROOT}/bin/bash ]] || ln -s "${ROOT}"{/tmp,}/bin/bash || return 1
 	[[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1
-
-	# remove me after Bug 585986
-	mkdir -p "${ROOT}"/etc/portage/patches/sys-apps/portage-2.3.52
-	cat > "${ROOT}"/etc/portage/patches/sys-apps/portage-2.3.52/path.patch <<EOP
-From 1b5edbb5ec70f1ae95b8f538a02037bb9a1ded9f Mon Sep 17 00:00:00 2001
-From: Benda Xu <heroxbd@gentoo.org>
-Date: Thu, 13 Dec 2018 16:53:16 +0800
-Subject: _doebuild_path: do not use host PATH by default and prepend EPREFIX
- PATH.
-
-  EPREFIX could be overridden in cross-eprefix, in that case tools
-  inside EPREFIX should be prioritized.
-
-  Link necessary binary tools to the test environment.
-
-Bug: https://bugs.gentoo.org/585986
-Closes: https://github.com/gentoo/portage/pull/387
-Signed-off-by: Zac Medico <zmedico@gentoo.org>
----
- lib/portage/package/ebuild/doebuild.py           |  9 ++++---
- lib/portage/tests/resolver/ResolverPlayground.py | 34 ++++++++++++++++++++++++
- 2 files changed, 39 insertions(+), 4 deletions(-)
-
-diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py
-index 5da9c9503..47c69967c 100644
---- a/lib/portage/package/ebuild/doebuild.py
-+++ b/lib/portage/package/ebuild/doebuild.py
-@@ -211,7 +211,6 @@ def _doebuild_path(settings, eapi=None):
- 	if portage_bin_path[0] != portage.const.PORTAGE_BIN_PATH:
- 		# Add a fallback path for restarting failed builds (bug 547086)
- 		portage_bin_path.append(portage.const.PORTAGE_BIN_PATH)
--	eprefix = portage.const.EPREFIX
- 	prerootpath = [x for x in settings.get("PREROOTPATH", "").split(":") if x]
- 	rootpath = [x for x in settings.get("ROOTPATH", "").split(":") if x]
- 	rootpath_set = frozenset(rootpath)
-@@ -219,9 +218,10 @@ def _doebuild_path(settings, eapi=None):
- 		"__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x]
- 
- 	prefixes = []
--	if eprefix:
--		prefixes.append(eprefix)
--	prefixes.append("/")
-+	# settings["EPREFIX"] should take priority over portage.const.EPREFIX
-+	if portage.const.EPREFIX != settings["EPREFIX"] and settings["ROOT"] == os.sep:
-+		prefixes.append(settings["EPREFIX"])
-+	prefixes.append(portage.const.EPREFIX)
- 
- 	path = overrides
- 
-@@ -245,6 +245,7 @@ def _doebuild_path(settings, eapi=None):
- 	path.extend(prerootpath)
- 
- 	for prefix in prefixes:
-+		prefix = prefix if prefix else "/"
- 		for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
- 			# Respect order defined in ROOTPATH
- 			x_abs = os.path.join(prefix, x)
-diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py
-index e2e061669..3997ad26e 100644
---- a/lib/portage/tests/resolver/ResolverPlayground.py
-+++ b/lib/portage/tests/resolver/ResolverPlayground.py
-@@ -10,6 +10,7 @@ from portage import os
- from portage import shutil
- from portage.const import (GLOBAL_CONFIG_PATH, PORTAGE_BASE_PATH,
- 	USER_CONFIG_PATH)
-+from portage.process import find_binary
- from portage.dep import Atom, _repo_separator
- from portage.package.ebuild.config import config
- from portage.package.ebuild.digestgen import digestgen
-@@ -76,6 +77,39 @@ class ResolverPlayground(object):
- 		self.debug = debug
- 		if eprefix is None:
- 			self.eprefix = normalize_path(tempfile.mkdtemp())
-+
-+			# EPREFIX/bin is used by fake true_binaries. Real binaries goes into EPREFIX/usr/bin
-+			eubin = os.path.join(self.eprefix, "usr", "bin")
-+			ensure_dirs(eubin)
-+			essential_binaries = (
-+				"awk",
-+				"basename",
-+				"bzip2",
-+				"cat",
-+				"chmod",
-+				"chown",
-+				"cp",
-+				"egrep",
-+				"env",
-+				"find",
-+				"grep",
-+				"head",
-+				"install",
-+				"ln",
-+				"mkdir",
-+				"mktemp",
-+				"mv",
-+				"rm",
-+				"sed",
-+				"sort",
-+				"tar",
-+				"tr",
-+				"uname",
-+				"uniq",
-+				"xargs",
-+			)
-+			for x in essential_binaries:
-+				os.symlink(find_binary(x), os.path.join(eubin, x))
- 		else:
- 			self.eprefix = normalize_path(eprefix)
- 
--- 
-cgit v1.2.1
-EOP
 }
 
 bootstrap_portage() {
@@ -730,8 +618,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.40.3"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40.3"
+	STABLE_PV="2.3.52.2"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.52.2"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"
@@ -748,14 +636,9 @@ bootstrap_portage() {
 	S="${S}/prefix-portage-${PV}"
 	cd "${S}"
 
-	# https://github.com/gentoo/portage/pull/389
-	sed -e 's,\${PORTAGE_OVERRIDE_EPREFIX}/usr/lib\*/portage/\*,\*/portage/\*/ebuild-helpers\*,' \
-		-i bin/ebuild-helpers/portageq || \
-		return 1
-
 	# disable ipc
 	sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-		-i pym/_emerge/AbstractEbuildProcess.py || \
+		-i lib/_emerge/AbstractEbuildProcess.py || \
 		return 1
 
 	# host-provided wget may lack certificates, stage1 wget is without ssl
@@ -796,8 +679,8 @@ bootstrap_portage() {
 
 	[[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" "${ROOT}"/tmp/usr/portage
 	for d in "${ROOT}"/tmp/usr/lib/python?.?; do
-		[[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/pym/portage ${d}/portage
-		[[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/pym/_emerge ${d}/_emerge
+		[[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/portage ${d}/portage
+		[[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/_emerge ${d}/_emerge
 	done
 
 	if [[ -s ${PORTDIR}/profiles/repo_name ]]; then

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     1eb33a8e730de9da7db0b0528ac24342898859e6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 08:44:55 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 08:44:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1eb33a8e

scripts/bootstrap-prefix.sh: bump snapshot for ppc-macos

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5440efe94a..f79751b135 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20181215"
+	local PV="20181227"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     4c718cec2c5a79a1b6e88a8ab5b770ee8b817d50
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 10:49:12 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 01:10:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4c718cec

Revert "scripts/bootstrap-prefix: add some dep-cycle workarounds from Sam Pfeiffer"

   Not needed anymore: We are now able to pass use flags from the env.

This reverts commit f81e23a7667ec3a0ed4b2af80c611be1b2d4d6d5.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ea6bc9313f..6af97eaba6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1549,20 +1549,9 @@ bootstrap_stage2() {
 	[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \
 		>> "${ROOT}"/tmp/etc/portage/package.mask
 
-	# kill some dependencies here while we're still fragile
-	{
-		# cmake has some external dependencies which require autoconf, etc.
-		# unless we only build the buildtool, bug #603012
-		echo "dev-util/cmake -server"
-		# avoid sys-apps/acl -> attr -> gettext cycle on Linux
-		echo "sys-devel/gettext -acl"
-		# gdbm depends on berkdb by default, which pulls in binutils
-		echo "dev-lang/perl -gdbm -berkdb"
-		# package needs perl, nls pulls in specific package
-		echo "sys-apps/help2man -nls"
-		# avoid hefty set of deps from glib
-		echo "dev-util/pkgconfig internal-glib"
-	} >> "${ROOT}"/tmp/etc/portage/package.use
+	# cmake has some external dependencies which require autoconf, etc.
+	# unless we only build the buildtool, bug #603012
+	echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
 
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     8e1dd215fb9401641e04199d1e69e7a5b498a7a3
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  1 10:17:37 2019 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan  1 10:17:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8e1dd215

s/bootstrap-prefix.sh: no /bin symlinks in prefix/standalone.

  In prefix/standalone, we keep USE=split-usr enabled to align with
  the default of Gentoo vanilla.

Closes: https://bugs.gentoo.org/674084
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6af97eaba6..d393c4d498 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -503,14 +503,21 @@ do_tree() {
 	do
 		[[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}"
 	done
-	# We can make bin a symlink because /usr is never split, this is
+	# Make symlinks as USE=split-usr is masked in prefix/rpath. This is
 	# necessary for Cygwin, as there is no such thing like an
 	# embedded runpath. Instead we put all the dlls next to the
 	# exes, to get them working even without the PATH environment
 	# variable being set up.
-	for x in lib sbin bin; do
-		[[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s usr/${x} )
-	done
+	#
+	# In prefix/standalone, however, no symlink is desired.
+	# Because we keep USE=split-usr enabled to align with the
+	# default of Gentoo vanilla.
+	if ! is-rap; then
+		for x in lib sbin bin; do
+			[[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s usr/${x} )
+		done
+	fi
+
 	mkdir -p "${PORTDIR}"
 	if [[ ! -e ${PORTDIR}/.unpacked ]]; then
 		efetch "$1/$2" || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     6987586f278fd5eb1683fa7e49d75dd7016278fb
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  3 09:21:08 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan  3 09:23:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6987586f

scripts/bootstrap-prefix: ensure USE is picked up in stage3

Portage seems to ignore USE= environment for build dependencies in a
different location.  Since we need this to be respected in order to
avoid many cycles, temporarily encode the requested USE-flags in
use.mask and use.force.  We use the profiles/ location which should get
wiped out hereafter, but also remove the files used whilst emerging to
reduce the risk of leaving this behind in someone's setup.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d393c4d498..9f4f1bbb38 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1452,6 +1452,22 @@ do_emerge_pkgs() {
 		done
 		myuse=( ${myuse} )
 
+		# Portage seems to ignore USE= for build dependencies.  Since
+		# that's what we're more or less doing all the time, encode the
+		# USE-flags in profiles/use.mask and profiles/use.force which
+		# normally do not exist.
+		rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force}
+		for use in "${myuse[@]}" ; do
+			case "${use}" in
+				-*) echo "${use#-}" \
+						>> "${EPREFIX}"/usr/portage/profiles/use.mask
+					;;
+				*)  echo "${use}" \
+						>> "${EPREFIX}"/usr/portage/profiles/use.force
+					;;
+				esac
+		done
+
 		# Disable the STALE warning because the snapshot frequently gets stale.
 		#
 		# Need need to spam the user about news until the emerge -e system
@@ -1472,6 +1488,7 @@ do_emerge_pkgs() {
 			emerge -v --oneshot --root-deps ${opts} "${pkg}" 
 		)
 		[[ $? -eq 0 ]] || return 1
+		rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force}
 
 		case ${pkg},${CHOST} in
 		app-shells/bash,*-cygwin*)
@@ -1663,7 +1680,7 @@ bootstrap_stage3() {
 		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
 		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
-		PORTAGE_OVERRIDE_EPREFIX="$(rapx "${ROOT}" "${ROOT}/tmp")" \
+		PORTAGE_OVERRIDE_EPREFIX="$(rapx "${ROOT}" "${ROOT}"/tmp)" \
 		FEATURES="${FEATURES} force-prefix $(rapx "" stacked-prefix)" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
 		do_emerge_pkgs "$@"
@@ -1816,7 +1833,7 @@ bootstrap_stage3() {
 		app-admin/eselect
 		$( [[ ${CHOST} == *-cygwin* ]] && echo sys-libs/cygwin-crypt )
 	)
-	# for grep we need to do a little workaround as we use llvm-3.4
+	# for grep we need to do a little workaround as we might use llvm-3.4
 	# here, which doesn't necessarily grok the system headers on newer
 	# OSX, confusing the buildsystem
 	ac_cv_c_decl_report=warning \
@@ -1824,7 +1841,8 @@ bootstrap_stage3() {
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
-		echo "We need openrc-run at ${ROOT}/sbin to merge rsync." > "${ROOT}"/sbin/openrc-run
+		echo "We need openrc-run at ${ROOT}/sbin to merge rsync." \
+			> "${ROOT}"/sbin/openrc-run
 		chmod +x "${ROOT}"/sbin/openrc-run
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     16f334babfb02f67c9d529ce4758fafbe1290787
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 19:55:22 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 19:57:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=16f334ba

scripts/bootstrap-prefix: ensure get_libdir doesn't return newlines

When portageq fails, it returns a newline, which we don't want to have
in our LDFLAGS (or anywhere else), so make sure we check if portageq
returned something useful.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ff5132ae7e..66edd753cf 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1668,7 +1668,11 @@ bootstrap_stage3() {
 		fi
 	fi
 
-	get_libdir() { portageq envvar LIBDIR_$(portageq envvar ABI) || echo lib; }
+	get_libdir() {
+		local l=$(portageq envvar LIBDIR_$(portageq envvar ABI) 2>/dev/null)
+		[[ -z ${l} ]] && l=lib
+		echo ${l}
+	}
 
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
 	export CPPFLAGS="-isystem ${ROOT}/usr/include"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8aa4df8e784b96b336a82abc383bba7c60426cdf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 19:53:24 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 19:57:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8aa4df8e

scripts/bootstrap-prefix: ensure temp libgcc_s remains available

On Solaris 64-bit, ensure libgcc_s remains available to stage2-built
objects, by copying and referencing a temp location.  gcc-config will
remove the libgcc_s from usr/lib, so we need to ensure it's in a place
where it won't get wiped (after installing the compiler)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6703edcc33..ff5132ae7e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1536,8 +1536,16 @@ bootstrap_stage2() {
 	# on Solaris 64-bits, (at least up to 10) libgcc_s resides in a
 	# non-standard location, and the compiler doesn't seem to record
 	# this in rpath while it does find it, resulting in a runtime trap
-	[[ ${CHOST} == x86_64-*-solaris* || ${CHOST} == sparcv9-*-solaris* ]] && \
-		cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ >& /dev/null
+	if [[ ${CHOST} == x86_64-*-solaris* || ${CHOST} == sparcv9-*-solaris* ]] ;
+	then
+		[[ -e ${ROOT}/tmp/usr/bin/gcc ]] || \
+			cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ >& /dev/null
+		# save another copy for after gcc-config gets run and removes
+		# usr/lib/libgcc_s.* because new links should use the compiler
+		# specific libgcc_s.
+		LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/tmp"
+		cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/tmp/ >& /dev/null
+	fi
 
 	# Disable RAP directory hacks of binutils and gcc.  If libc.so
 	# linker script provides no hint of ld-linux*.so*, ld should

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d7279964558064987ebc8fee5120bc15d1b8db3d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 19:52:19 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 19:57:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d7279964

scripts/bootstrap-prefix: bootstrap with older GCC when using older GCC

GCC-4.7 cannot be compiled with GCC-3, bootstrap with GCC-4.2 for that.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9f4f1bbb38..6703edcc33 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -172,8 +172,10 @@ configure_toolchain() {
 	  eval $( (gcc -E - | grep compiler_stage1) <<-EOP
 		#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7))
 		  compiler_stage1+=" sys-devel/gcc"
-		#else
+		#elif defined(__GNUC__) && __GNUC__ >= 4
 		  compiler_stage1+=" <sys-devel/gcc-4.8"
+		#else
+		  compiler_stage1+=" <sys-devel/gcc-4.7"
 		#endif
 		EOP
 	  )

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d327db7632339373acfb1482a29b4aa3dd92120d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  6 11:38:15 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan  6 11:38:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d327db76

scripts/bootstrap-prefix: make libgcc_s copying verbose

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 66edd753cf..e9cafdb11d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1538,13 +1538,15 @@ bootstrap_stage2() {
 	# this in rpath while it does find it, resulting in a runtime trap
 	if [[ ${CHOST} == x86_64-*-solaris* || ${CHOST} == sparcv9-*-solaris* ]] ;
 	then
+		local libgccs64=/usr/sfw/lib/64/libgcc_s.so.1
 		[[ -e ${ROOT}/tmp/usr/bin/gcc ]] || \
-			cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ >& /dev/null
+			cp "${libgccs64}" "${ROOT}"/tmp/usr/lib/
 		# save another copy for after gcc-config gets run and removes
 		# usr/lib/libgcc_s.* because new links should use the compiler
-		# specific libgcc_s.
+		# specific libgcc_s, but existing objs need to find this
+		# libgcc_s for as long as they are around (bash->libreadline)
 		LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/tmp"
-		cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/tmp/ >& /dev/null
+		cp "${libgccs64}" "${ROOT}"/tmp/tmp/
 	fi
 
 	# Disable RAP directory hacks of binutils and gcc.  If libc.so

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     48d25efbdd1168a074338d7bf636a532aec81bd6
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  7 14:55:54 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Jan  7 16:20:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=48d25efb

bootstrap-prefix.sh: really fake install-info too

sys-apps/groff really lacks a dependency on texinfo or should configure
--without-doc. As the INSTALL_INFO environment variable from stage3 is
not preserved for emerge -e system, the host system's real install-info
program does choke on empty info files generated by our fake makeinfo.
Also, have makeinfo touch only real output files from -o or --output.

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e9cafdb11d..8ff6f94057 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1705,20 +1705,30 @@ bootstrap_stage3() {
 	# GCC sometimes decides that it needs to run makeinfo to update some
 	# info pages from .texi files.  Obviously we don't care at this
 	# stage and rather have it continue instead of aborting the build
-	[[ -x "${ROOT}"/usr/bin/makeinfo ]] || cat > "${ROOT}"/usr/bin/makeinfo <<-EOF
+	if [[ ! -x "${ROOT}"/usr/bin/makeinfo ]]
+	then
+		cat > "${ROOT}"/usr/bin/makeinfo <<-EOF
 		#!${ROOT}/bin/bash
+		### bootstrap-prefix.sh will act on this line ###
 		echo "makeinfo GNU texinfo 4.13"
-		for a in \$@; do
+		f=
+		while (( \$# > 0 )); do
+		a=\$1
+		shift
 		case \$a in
-		--*) f=\$(echo "\$a" | sed -r 's,--.*=(.*),\1,') ;;
-		-*) continue ;;
-		*) f=\$a ;;
+		--output=) continue ;;
+		--output=*) f=\${a#--output=} ;;
+		-o) f=\$1; shift;;
 		esac
-		[[ -e \$f ]] || touch \$f
 		done
+		[[ -z \$f ]] || [[ -e \$f ]] || touch "\$f"
+		EOF
+		cat > "${ROOT}"/usr/bin/install-info <<-EOF
+		#!${ROOT}/bin/bash
+		:
 		EOF
-	chmod +x "${ROOT}"/usr/bin/makeinfo
-	export INSTALL_INFO="${ROOT}"/usr/bin/makeinfo
+		chmod +x "${ROOT}"/usr/bin/{makeinfo,install-info}
+	fi
 
 	if is-rap ; then
 		# Bug 655414. Copy portage global config from stage2

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     48f7d301d03ae476e571729f291fa886f07da8ce
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  7 15:08:17 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Jan  7 16:20:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=48f7d301

bootstrap-prefix.sh: load bash-4.3_p39-cygwin-r2.patch from dev.g.o

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8ff6f94057..7ce41e7b63 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -740,7 +740,7 @@ bootstrap_gnu() {
 			"-p0" \
 			"${GENTOO_MIRRORS}/distfiles/bash43-"{001..048} \
 			"-p2" \
-			https://gitweb.gentoo.org/repo/proj/prefix.git/plain/app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch \
+			https://dev.gentoo.org/~haubi/distfiles/bash-4.3_p39-cygwin-r2.patch \
 		; do
 			if [[ ${p} == -* ]] ; then
 				patchopts=${p}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     eae34e06e32a191f4b6b2e11687f8f473111774a
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  8 16:25:31 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Jan  8 16:25:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=eae34e06

bootstrap-prefix.sh: direct to wiki/Prefix/Cygwin

Instead of details telling how to compile a working cygwin1.dll, show
the Gentoo wiki/Prefix/Cygwin link now.
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7ce41e7b63..e547e6d1bf 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2029,28 +2029,10 @@ to Windows, in that he completed a piece of code to support myself.
 Although you already use that piece of code - yes, it's called Cygwin,
 you seem to not use this freaky guy's completions yet.
 
-So let me tell you how to help me out of the incompatibility hole:
-1) Make sure you have installed your Cygwin instance on the very same
-   NTFS partition you want myself to work on. And yes, I really need NTFS.
-2) 'Clone or download' the Cygwin source including this guy's fixes
-   from https://github.com/haubi/newlib-cygwin/tree/gentoo
-3) Back up your current /bin/cygwin1.dll:
-     $ cp /bin/cygwin1.dll /bin/cygwin1.dll.orig
-4) Compile these Cygwin sources to get some cygwin0.dll, as in:
-     $ unzip newlib-cygwin-gentoo.zip
-     $ cd newlib-cygwin-gentoo
-     $ ./configure
-     $ make
-5) Prepare the new cygwin0.dll for replacing your current one:
-     $ cp *-cygwin/winsup/cygwin0.dll /bin/cygwin1.dll.new
-6) Create the /var/run/cygfork directory:
-     $ mkdir --mode=a=rwxt /var/run/cygfork
-7) Stop all your Cygwin processes.
-8) Replace your old cygwin1.dll with the new one, using your
-   Windows Explorer in $(cygpath -w /bin)
-9) Start your Cygwin processes again, or reboot your Windows.
-10) Start over with myself to continue.
-11) Remember that you won't get support from upstream Cygwin now.
+To help me out of the incompatibility hole, please read and follow
+https://wiki.gentoo.org/wiki/Prefix/Cygwin first.
+
+But remember that you won't get support from upstream Cygwin now.
 EOF
 		  exit 1
 		fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     6dc38bd8eaa983a25f061831f7921f3e562a6038
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  9 10:46:37 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  9 13:49:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6dc38bd8

scripts/bootstrap-prefix: allow resume of stage3 after python-exec

Portage installs python-exec also in ROOT/tmp, which foobars the
manually bootstrapped python installation there, rendering it broken.
In a successful bootstrap this goes unnoticed, because the running
Portage (=Python) session installs Python later in the same merge
sequence.  As such, after that emerge, the python from ROOT is picked
up.  If we failed on one of the packages between python-exec and python,
however (~60 pkgs inbetween, including a compiler) we leave the setup in
a broken state.

Hence, prior to starting stage3, re-new the Python 2.7 symlinks to deal
with the scenario of resuming a broken off stage3.  Since ROOT/tmp gets
removed shortly after Python gets installed in ROOT, it is fine that we
effectively kill python-exec in ROOT/tmp here.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e547e6d1bf..9ce12729e3 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1670,6 +1670,15 @@ bootstrap_stage3() {
 		fi
 	fi
 
+	# if we resume this stage and python-exec was installed already in
+	# tmp, we basically made the system unusable, so remove python-exec
+	# here so we can use the python in tmp
+	for pef in python{,2} python{,2}-config ; do
+		rm -f "${ROOT}"/tmp/usr/bin/${pef}
+		[[ ${pef} == *-config ]] && ppf=-config || ppf=
+		( cd "${ROOT}"/tmp/usr/bin && ln -s python2.7${ppf} ${pef} )
+	done
+
 	get_libdir() {
 		local l=$(portageq envvar LIBDIR_$(portageq envvar ABI) 2>/dev/null)
 		[[ -z ${l} ]] && l=lib

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     845833bbd940f60434c682562d516c5ace24c3e0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 07:27:05 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 08:19:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=845833bb

scripts/bootstrap-prefix: propagate *FLAGS to target too

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9ce12729e3..cced408b42 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1454,10 +1454,11 @@ do_emerge_pkgs() {
 		done
 		myuse=( ${myuse} )
 
-		# Portage seems to ignore USE= for build dependencies.  Since
-		# that's what we're more or less doing all the time, encode the
-		# USE-flags in profiles/use.mask and profiles/use.force which
-		# normally do not exist.
+		# Portage seems to ignore USE=, *FLAGS for target dependencies.
+		# Since that's what we're more or less doing all the time,
+		# encode the USE-flags in profiles/use.mask and
+		# profiles/use.force which normally do not exist.  Get LDFLAGS
+		# set through make.conf.
 		rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force}
 		for use in "${myuse[@]}" ; do
 			case "${use}" in
@@ -1469,6 +1470,12 @@ do_emerge_pkgs() {
 					;;
 				esac
 		done
+		sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf
+		{
+			echo "CFLAGS=\"\${CFLAGS} ${OVERRIDE_CFLAGS}\" #stage3_temp#"
+			echo "CXXFLAGS=\"\${CXXFLAGS} ${OVERRIDE_CXXFLAGS}\" #stage3_temp#"
+			echo "LDFLAGS=\"\${LDFLAGS} ${LDFLAGS}\" #stage3_temp#"
+		} >> "${EPREFIX}"/tmp/etc/portage/make.conf
 
 		# Disable the STALE warning because the snapshot frequently gets stale.
 		#
@@ -1491,6 +1498,7 @@ do_emerge_pkgs() {
 		)
 		[[ $? -eq 0 ]] || return 1
 		rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force}
+		sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf
 
 		case ${pkg},${CHOST} in
 		app-shells/bash,*-cygwin*)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     dc976fc5bc8c2d0f65127941c649d679c0063eab
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 07:27:41 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 08:19:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dc976fc5

scripts/bootstrap-prefix: don't remove LDFLAGS too soon in stage3

We need LDFLAGS to ensure we link/rpath against libs in ROOT, iso
ROOT/tmp whilst building.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cced408b42..39e508de56 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1857,7 +1857,7 @@ bootstrap_stage3() {
 		rm -f "${ROOT}"/bin/sh
 		ln -s bash "${ROOT}"/bin/sh
 	fi
-	unset CONFIG_SHELL MAKEINFO CXX CPPFLAGS LDFLAGS
+	# start using apps from new target
 	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
 	# get a sane bash, overwriting tmp symlinks
@@ -1900,6 +1900,7 @@ bootstrap_stage3() {
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	# Switch to the proper portage.
+	unset CONFIG_SHELL MAKEINFO CXX CPPFLAGS LDFLAGS
 	hash -r
 
 	# Update the portage tree.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     b109ca82c51df4073dbb37ff239f6097504582ef
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 17:28:23 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 17:34:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b109ca82

bootstrap-prefix.sh: provide fake makeinfo early

Provide fake makeinfo scripts early enough to avoid MAKEINFO variable.
Closes: https://bugs.gentoo.org/673808

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 55 ++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 39e508de56..d74a35372d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1539,7 +1539,30 @@ bootstrap_stage2() {
 	# GCC sometimes decides that it needs to run makeinfo to update some
 	# info pages from .texi files.  Obviously we don't care at this
 	# stage and rather have it continue instead of abort the build
-	export MAKEINFO="echo makeinfo GNU texinfo 4.13"
+	if [[ ! -x "${ROOT}"/tmp/usr/bin/makeinfo ]]
+	then
+		cat > "${ROOT}"/tmp/usr/bin/makeinfo <<-EOF
+		#!${ROOT}/bin/bash
+		### bootstrap-prefix.sh will act on this line ###
+		echo "makeinfo GNU texinfo 4.13"
+		f=
+		while (( \$# > 0 )); do
+		a=\$1
+		shift
+		case \$a in
+		--output=) continue ;;
+		--output=*) f=\${a#--output=} ;;
+		-o) f=\$1; shift;;
+		esac
+		done
+		[[ -z \$f ]] || [[ -e \$f ]] || touch "\$f"
+		EOF
+		cat > "${ROOT}"/tmp/usr/bin/install-info <<-EOF
+		#!${ROOT}/bin/bash
+		:
+		EOF
+		chmod +x "${ROOT}"/tmp/usr/bin/{makeinfo,install-info}
+	fi
 
 	# on Solaris 64-bits, (at least up to 10) libgcc_s resides in a
 	# non-standard location, and the compiler doesn't seem to record
@@ -1719,32 +1742,12 @@ bootstrap_stage3() {
 		do_emerge_pkgs "$@"
 	}
 
-	# GCC sometimes decides that it needs to run makeinfo to update some
-	# info pages from .texi files.  Obviously we don't care at this
-	# stage and rather have it continue instead of aborting the build
+	# Some packages fail to properly depend on sys-apps/texinfo.
+	# We don't really need that package, so we fake it instead,
+	# explicitly emerging it later on will overwrite the fakes.
 	if [[ ! -x "${ROOT}"/usr/bin/makeinfo ]]
 	then
-		cat > "${ROOT}"/usr/bin/makeinfo <<-EOF
-		#!${ROOT}/bin/bash
-		### bootstrap-prefix.sh will act on this line ###
-		echo "makeinfo GNU texinfo 4.13"
-		f=
-		while (( \$# > 0 )); do
-		a=\$1
-		shift
-		case \$a in
-		--output=) continue ;;
-		--output=*) f=\${a#--output=} ;;
-		-o) f=\$1; shift;;
-		esac
-		done
-		[[ -z \$f ]] || [[ -e \$f ]] || touch "\$f"
-		EOF
-		cat > "${ROOT}"/usr/bin/install-info <<-EOF
-		#!${ROOT}/bin/bash
-		:
-		EOF
-		chmod +x "${ROOT}"/usr/bin/{makeinfo,install-info}
+		cp -p "${ROOT}"/tmp/usr/bin/{makeinfo,install-info} "${ROOT}"/usr/bin
 	fi
 
 	if is-rap ; then
@@ -1900,7 +1903,7 @@ bootstrap_stage3() {
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	# Switch to the proper portage.
-	unset CONFIG_SHELL MAKEINFO CXX CPPFLAGS LDFLAGS
+	unset CONFIG_SHELL CXX CPPFLAGS LDFLAGS
 	hash -r
 
 	# Update the portage tree.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     9e84e77e779219d209a2474a7f04bfcd81212e6a
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 20:22:42 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 29 14:42:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9e84e77e

bootstrap-prefix.sh: selectively use stacked-prefix

Use stacked prefix only up to before merging sys-apps/portage itself
with dependencies, even for RAP now.
Closes: https://bugs.gentoo.org/676096

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 55 +++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d74a35372d..f5be868d77 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1736,12 +1736,22 @@ bootstrap_stage3() {
 		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
 		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
-		PORTAGE_OVERRIDE_EPREFIX="$(rapx "${ROOT}" "${ROOT}"/tmp)" \
-		FEATURES="${FEATURES} force-prefix $(rapx "" stacked-prefix)" \
+		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
 		do_emerge_pkgs "$@"
 	}
 
+	with_stack_emerge_pkgs() {
+		FEATURES="${FEATURES} stacked-prefix" \
+		PORTAGE_OVERRIDE_EPREFIX="${ROOT}/tmp" \
+		emerge_pkgs "$@"
+	}
+
+	without_stack_emerge_pkgs() {
+		PORTAGE_OVERRIDE_EPREFIX="${ROOT}" \
+		emerge_pkgs "$@"
+	}
+
 	# Some packages fail to properly depend on sys-apps/texinfo.
 	# We don't really need that package, so we fake it instead,
 	# explicitly emerging it later on will overwrite the fakes.
@@ -1751,13 +1761,6 @@ bootstrap_stage3() {
 	fi
 
 	if is-rap ; then
-		# Bug 655414. Copy portage global config from stage2
-		# to stage3.
-		if [[ ! -d "${ROOT}"/usr/share/portage ]]; then
-			mkdir -p "${ROOT}"/usr/share
-			cp -a "${ROOT}"{/tmp,}/usr/share/portage
-		fi
-
 		# We need ${ROOT}/usr/bin/perl to merge glibc.
 		if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then
 			# trick "perl -V:apiversion" check of glibc-2.19.
@@ -1779,7 +1782,7 @@ bootstrap_stage3() {
 		)
 
 		BOOTSTRAP_RAP=yes \
-		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 		grep -q 'apiversion=9999' "${ROOT}"/usr/bin/perl && rm "${ROOT}"/usr/bin/perl
 
 		pkgs=(
@@ -1791,7 +1794,7 @@ bootstrap_stage3() {
 		RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
 		export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
 		BOOTSTRAP_RAP=yes \
-		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
 		# remove stage2 ld so that stage3 ld is used by stage2 gcc.
 		[[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
@@ -1809,7 +1812,7 @@ bootstrap_stage3() {
 			${linker}
 		)
 
-		emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	fi
 
 	# On some hosts, gcc gets confused now when it uses the new linker,
@@ -1843,9 +1846,12 @@ bootstrap_stage3() {
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \
 	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 	PYTHON_COMPAT_OVERRIDE=python2.7 \
-	emerge_pkgs --nodeps ${compiler} || return 1
+	with_stack_emerge_pkgs --nodeps ${compiler} || return 1
 	# undo libgcc_s.so path of stage2
 
+	# now we have the compiler right there
+	unset CXX CPPFLAGS LDFLAGS
+
 	# On Darwin we have llvm-3.5 at this point, which provides nm.
 	# However for some reason this nm doesn't quite get it on newer
 	# platforms at least, resulting in bugs like #598336.  To cater for
@@ -1864,7 +1870,10 @@ bootstrap_stage3() {
 	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
 	# get a sane bash, overwriting tmp symlinks
-	emerge_pkgs "" "app-shells/bash" || return 1
+	with_stack_emerge_pkgs "" "app-shells/bash" || return 1
+
+	# now we have a shell right there
+	unset CONFIG_SHELL
 
 	# Build portage and dependencies.
 	pkgs=(
@@ -1884,7 +1893,7 @@ bootstrap_stage3() {
 	# OSX, confusing the buildsystem
 	ac_cv_c_decl_report=warning \
 	TIME_T_32_BIT_OK=yes \
-	emerge_pkgs "" "${pkgs[@]}" || return 1
+	with_stack_emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
 		echo "We need openrc-run at ${ROOT}/sbin to merge rsync." \
@@ -1899,11 +1908,23 @@ bootstrap_stage3() {
 		sys-devel/gettext
 		sys-apps/portage
 	)
+
+	# Bug 655414, 676096.
+	# Enough packages emerged using stacked-prefix with tmp/ as base prefix
+	# to allow for sys-apps/portage itself and dependencies without any
+	# dependency into tmp/ now.
+	# Portage does search it's global config using PORTAGE_OVERRIDE_EPREFIX,
+	# so we need to provide it there - emerging portage itself is expected
+	# to finally overwrite it.
+	if [[ ! -d "${ROOT}"/usr/share/portage ]]; then
+		mkdir -p "${ROOT}"/usr/share
+		cp -a "${ROOT}"{/tmp,}/usr/share/portage
+	fi
+
 	USE="ssl" \
-	emerge_pkgs "" "${pkgs[@]}" || return 1
+	without_stack_emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	# Switch to the proper portage.
-	unset CONFIG_SHELL CXX CPPFLAGS LDFLAGS
 	hash -r
 
 	# Update the portage tree.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4dd3b2ec39f2cee3f0fd9238d7474d50927dc6b3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  6 16:40:22 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Feb  6 16:40:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4dd3b2ec

scripts/bootstrap-prefix: bump bootstrap snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f5be868d77..7be6feb902 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -533,7 +533,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20181227"
+	local PV="20190204"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     369de8659d76e9dbc5b50db9a2cb859c012a6455
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 20:12:03 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 20:12:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=369de865

scripts/bootstrap-prefix: get past stage2 on sparc-sun-solaris2.10

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7be6feb902..5d31ee4de6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -299,6 +299,17 @@ configure_toolchain() {
 				sys-devel/llvm
 				sys-devel/clang"
 			;;
+		*-solaris*)
+			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
+			case "${ccvers}" in
+				*"gcc (GCC) 3.4.3"*)
+					# host compiler doesn't cope with the asm introduced
+					# in mpfr-4, so force using an older one during
+					# bootstrap for this target
+					compiler_stage1="<dev-libs/mpfr-4 ${compiler_stage1}"
+					;;
+			esac
+			;;
 		*-*-aix*)
 			linker=sys-devel/native-cctools
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     daad663fb7beafa540785994d14dade98ad03901
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 07:49:53 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 07:52:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=daad663f

scripts/bootstrap-prefix: fix bootstrap on Solaris 10

mpfr needs gmp, so the version pinning hack needs slightly more work

Closes: https://bugs.gentoo.org/678464
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cd833982af..fc2601f267 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -306,7 +306,7 @@ configure_toolchain() {
 					# host compiler doesn't cope with the asm introduced
 					# in mpfr-4, so force using an older one during
 					# bootstrap for this target
-					compiler_stage1="<dev-libs/mpfr-4 ${compiler_stage1}"
+					compiler_stage1=${compiler_stage1/" dev-libs/mpfr "/" <dev- libs/mpfr-4 "}
 					;;
 			esac
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     88a1d0effad32c6aa18c4f386daaa2116986739e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 07:48:02 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 07:51:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=88a1d0ef

scripts/bootstrap-prefix: bump bootstrap snapshot

Verified on i386-pc-solaris2.11, x86_64-pc-solaris2.11,
x86_64-apple-darwin17, powerpc-apple-darwin9

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5d31ee4de6..cd833982af 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -544,7 +544,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20190204"
+	local PV="20190219"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     515803f8e73e5ae87463b372304d4dd93b047aa5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 07:31:08 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 07:31:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=515803f8

scripts/bootstrap-prefix: fix invalid atom, thanks Arfrever

Closes: https://bugs.gentoo.org/678464
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fc2601f267..89780de099 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -306,7 +306,7 @@ configure_toolchain() {
 					# host compiler doesn't cope with the asm introduced
 					# in mpfr-4, so force using an older one during
 					# bootstrap for this target
-					compiler_stage1=${compiler_stage1/" dev-libs/mpfr "/" <dev- libs/mpfr-4 "}
+					compiler_stage1=${compiler_stage1/" dev-libs/mpfr "/" <dev-libs/mpfr-4 "}
 					;;
 			esac
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     732e197aabcb3cb107e5d719ff0b2e2597821d0f
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 13:59:09 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 14:00:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=732e197a

bump stage1 m4-1.4.18, may work with glibc-2.28

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 89780de099..41ef7f7036 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1193,7 +1193,10 @@ bootstrap_bison() {
 }
 
 bootstrap_m4() {
-	bootstrap_gnu m4 1.4.17 || bootstrap_gnu m4 1.4.16 || bootstrap_gnu m4 1.4.15
+	bootstrap_gnu m4 1.4.18 ||
+	bootstrap_gnu m4 1.4.17 ||
+	bootstrap_gnu m4 1.4.16 ||
+	bootstrap_gnu m4 1.4.15
 }
 
 bootstrap_gzip() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     872f887a9a5550c83dd558d8488acf561acc27e9
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 15:14:48 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 15:14:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=872f887a

bootstrap-prefix.sh: fail if stage1 make fails to build

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 41ef7f7036..1520bee986 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1153,7 +1153,7 @@ bootstrap_tar() {
 
 bootstrap_make() {
 	MAKEOPTS= # no GNU make yet
-	bootstrap_gnu make 4.2.1
+	bootstrap_gnu make 4.2.1 || return 1
 	if [[ ${MAKE} == gmake ]] ; then
 		# make make available as gmake
 		( cd ${ROOT}/tmp/usr/bin && ln -s make gmake )

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     83f06a22d04e760b1509b8dd042fae4a26c1562a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 11:13:55 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 11:16:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=83f06a22

scripts/bootstrap-prefix: allow usage of pre-set USE-flags

in bootstrap_setup, record requested USE-flags in make.conf such that
for example we can fairly cleanly and painless bootstrap a USE=libressl
prefix.

Verified with i386-pc-solaris2.11/20190305

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1520bee986..6b76007f86 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -357,8 +357,10 @@ bootstrap_setup() {
 				echo "# Avoid problems due to case-insensitivity, bug #524236"
 				echo 'FEATURES="${FEATURES} case-insensitive-fs"'
 			fi
-			[[ -n $PORTDIR_OVERLAY ]] && \
+			[[ -n ${PORTDIR_OVERLAY} ]] && \
 				echo "PORTDIR_OVERLAY=\"\${PORTDIR_OVERLAY} ${PORTDIR_OVERLAY}\""
+			[[ -n ${MAKE_CONF_ADDITIONAL_USE} ]] &&
+				echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
 			[[ ${OFFLINE_MODE} ]] && \
 				echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
 		} > "${ROOT}"/etc/portage/make.conf

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0bc183525dc6c19a693c525869734aca7639f65f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 12:09:36 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 12:10:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0bc18352

scripts/bootstrap-prefix: bump bootstrap snapshot

Verified with i386-pc-solaris2.11/20190305, allows USE=libressl

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6b76007f86..1998896349 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -546,7 +546,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20190219"
+	local PV="20190305"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b81cd60acf8b5b8465c4849719259321b99e6467
Author:     hsk17 <hsk17 <AT> mail <DOT> de>
AuthorDate: Wed Mar  6 12:23:03 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 12:23:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b81cd60a

scripts/bootstrap-prefix: unify libffi behaviour in bootstrap_gnu

due to commit 94a0ab4f, which adds -L${ROOT}/tmp/usr/lib64 to LDFLAGS
in bootstrap_python(), the python bootstrap build sees libffi.so and
succeeds.  but there is no -Wl,-rpath,${ROOT}/tmp/usr/lib64, and the
built _ctypes.so is unusable as the run time loader does not find
libffi.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1998896349..70863e2396 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -813,20 +813,22 @@ bootstrap_gnu() {
 	# SuSE 11.1 has GNU binutils-2.20, choking on crc32_x86
 	[[ ${PN} == "xz" ]] && myconf="${myconf} --disable-assembler"
 
-	# we do not have pkg-config to find lib/libffi-*/include/ffi.h
-	[[ ${PN} == "libffi" ]] && 
-	sed -i -e '/includesdir =/s/=.*/= $(includedir)/' include/Makefile.in
-
-	# we have to build the libraries for correct bitwidth
-	[[ " libffi " == *" ${PN} "* ]] &&
-	case $CHOST in
-	(x86_64-*-*|sparcv9-*-*)
-		export CFLAGS="-m64"
-		;;
-	(i?86-*-*)
-		export CFLAGS="-m32"
-		;;
-	esac
+	if [[ ${PN} == "libffi" ]] ; then
+		# we do not have pkg-config to find lib/libffi-*/include/ffi.h
+		sed -i -e '/includesdir =/s/=.*/= $(includedir)/' include/Makefile.in
+		# force install into libdir
+		myconf="${myconf} --libdir=${ROOT}/tmp/usr/lib"
+		sed -i -e '/toolexeclibdir =/s/=.*/= $(libdir)/' Makefile.in
+		# we have to build the libraries for correct bitwidth
+		case $CHOST in
+		(x86_64-*-*|sparcv9-*-*)
+			export CFLAGS="-m64"
+			;;
+		(i?86-*-*)
+			export CFLAGS="-m32"
+			;;
+		esac
+	fi
 
 	einfo "Compiling ${PN}"
 	econf ${myconf} || return 1
@@ -979,7 +981,7 @@ EOP
 	# python refuses to find the zlib headers that are built in the offset,
 	# same for libffi, which installs into compiler's multilib-osdir
 	export CPPFLAGS="-I${ROOT}/tmp/usr/include"
-	export LDFLAGS="${CFLAGS} -L${ROOT}/tmp/usr/lib -L${ROOT}/tmp/usr/lib64"
+	export LDFLAGS="${CFLAGS} -L${ROOT}/tmp/usr/lib"
 	# set correct flags for runtime for ELF platforms
 	case $CHOST in
 		*-linux*)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3874c263e5eaa15cd376fb4fb7583443f1772c54
Author:     hsk17 <hsk17 <AT> mail <DOT> de>
AuthorDate: Wed Mar  6 12:33:58 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 12:33:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3874c263

scripts/bootstrap-prefix: set libdir for python install

Bug: https://bugs.gentoo.org/678900
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 70863e2396..da6017f1bd 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1016,6 +1016,7 @@ EOP
 		--disable-toolbox-glue \
 		--disable-ipv6 \
 		--disable-shared \
+		--libdir="${ROOT}"/tmp/usr/lib \
 		${myconf} || return 1
 	$MAKE ${MAKEOPTS} || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3dba87d0ba4def5d4306baed53ef5341ad7f314e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 13:41:28 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 13:43:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3dba87d0

scripts/bootstrap-prefix: avoid errors for every emerge

etc/portage may not exist, so ensure it is created, and don't assume
make.conf exists in it

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index da6017f1bd..d014d9dbb2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1489,7 +1489,9 @@ do_emerge_pkgs() {
 					;;
 				esac
 		done
-		sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf
+		mkdir -p "${EPREFIX}"/tmp/etc/portage
+		[[ -e "${EPREFIX}"/tmp/etc/portage/make.conf ]] && \
+			sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf
 		{
 			echo "CFLAGS=\"\${CFLAGS} ${OVERRIDE_CFLAGS}\" #stage3_temp#"
 			echo "CXXFLAGS=\"\${CXXFLAGS} ${OVERRIDE_CXXFLAGS}\" #stage3_temp#"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     64926170d7df734cfec916a7787975a32962e206
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 16:46:12 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 16:46:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=64926170

scripts/bootstrap-prefix: fix bootstrap on 64-bits solaris

The workaround to put the 64-bits libgcc_s in tmp/tmp only works when
tmp/tmp exists, which it doesn't by default.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d014d9dbb2..f70c99ce58 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1598,6 +1598,7 @@ bootstrap_stage2() {
 		# specific libgcc_s, but existing objs need to find this
 		# libgcc_s for as long as they are around (bash->libreadline)
 		LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/tmp"
+		mkdir -p "${ROOT}"/tmp/tmp/
 		cp "${libgccs64}" "${ROOT}"/tmp/tmp/
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     11073def39355bf26f06f79aaa00d41000744d8e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 18:09:52 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 18:15:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=11073def

scripts/bootstrap-prefix: bump bootstrap snapshot

this brings in gcc-8.3 and libressl patched for Solaris

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a0d51338fd..704062c7e4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -546,7 +546,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20190305"
+	local PV="20190313"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fc5f2ff3c8b8eb894ee37fcdf0c74f20c6dc3aaa
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 18:06:18 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 18:15:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fc5f2ff3

scripts/bootstrap-prefix: remove obsoleted hack for BDEPEND-emerge

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 54 +++++++++++++++------------------------------
 1 file changed, 18 insertions(+), 36 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f70c99ce58..a0d51338fd 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1473,37 +1473,13 @@ do_emerge_pkgs() {
 		done
 		myuse=( ${myuse} )
 
-		# Portage seems to ignore USE=, *FLAGS for target dependencies.
-		# Since that's what we're more or less doing all the time,
-		# encode the USE-flags in profiles/use.mask and
-		# profiles/use.force which normally do not exist.  Get LDFLAGS
-		# set through make.conf.
-		rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force}
-		for use in "${myuse[@]}" ; do
-			case "${use}" in
-				-*) echo "${use#-}" \
-						>> "${EPREFIX}"/usr/portage/profiles/use.mask
-					;;
-				*)  echo "${use}" \
-						>> "${EPREFIX}"/usr/portage/profiles/use.force
-					;;
-				esac
-		done
-		mkdir -p "${EPREFIX}"/tmp/etc/portage
-		[[ -e "${EPREFIX}"/tmp/etc/portage/make.conf ]] && \
-			sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf
-		{
-			echo "CFLAGS=\"\${CFLAGS} ${OVERRIDE_CFLAGS}\" #stage3_temp#"
-			echo "CXXFLAGS=\"\${CXXFLAGS} ${OVERRIDE_CXXFLAGS}\" #stage3_temp#"
-			echo "LDFLAGS=\"\${LDFLAGS} ${LDFLAGS}\" #stage3_temp#"
-		} >> "${EPREFIX}"/tmp/etc/portage/make.conf
-
 		# Disable the STALE warning because the snapshot frequently gets stale.
 		#
 		# Need need to spam the user about news until the emerge -e system
 		# because the tools aren't available to read the news item yet anyway.
 		#
-		# Avoid circular deps caused by the default profiles (and IUSE defaults).
+		# Avoid circular deps caused by the default profiles (and IUSE
+		# defaults).
 		echo "USE=${myuse[*]} PKG=${pkg}"
 		(
 			unset CFLAGS CXXFLAGS
@@ -1518,8 +1494,6 @@ do_emerge_pkgs() {
 			emerge -v --oneshot --root-deps ${opts} "${pkg}" 
 		)
 		[[ $? -eq 0 ]] || return 1
-		rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force}
-		sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf
 
 		case ${pkg},${CHOST} in
 		app-shells/bash,*-cygwin*)
@@ -1786,13 +1760,15 @@ bootstrap_stage3() {
 		# We need ${ROOT}/usr/bin/perl to merge glibc.
 		if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then
 			# trick "perl -V:apiversion" check of glibc-2.19.
-			echo -e "#!${ROOT}/bin/sh\necho 'apiversion=9999'" > "${ROOT}"/usr/bin/perl
+			echo -e "#!${ROOT}/bin/sh\necho 'apiversion=9999'" \
+				> "${ROOT}"/usr/bin/perl
 			chmod +x "${ROOT}"/usr/bin/perl
 		fi
 		# Tell dynamic loader the path of libgcc_s.so of stage2
 		if [[ ! -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf ]]; then
 			mkdir -p "${ROOT}"/etc/ld.so.conf.d
-			dirname $(gcc -print-libgcc-file-name) > "${ROOT}"/etc/ld.so.conf.d/stage2.conf
+			dirname $(gcc -print-libgcc-file-name) \
+				> "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 		fi
 
 		pkgs=(
@@ -1805,7 +1781,8 @@ bootstrap_stage3() {
 
 		BOOTSTRAP_RAP=yes \
 		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
-		grep -q 'apiversion=9999' "${ROOT}"/usr/bin/perl && rm "${ROOT}"/usr/bin/perl
+		grep -q 'apiversion=9999' "${ROOT}"/usr/bin/perl && \
+			rm "${ROOT}"/usr/bin/perl
 
 		pkgs=(
 			sys-devel/binutils-config
@@ -1819,7 +1796,8 @@ bootstrap_stage3() {
 		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
 		# remove stage2 ld so that stage3 ld is used by stage2 gcc.
-		[[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
+		[[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && \
+			mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
 	else
 		pkgs=(
 			sys-apps/gentoo-functions
@@ -1847,7 +1825,8 @@ bootstrap_stage3() {
 	# Clang unconditionally requires python, the eclasses are really not
 	# setup for a scenario where python doesn't live in the target
 	# prefix and no helpers are available
-	( cd "${ROOT}"/usr/bin && test ! -e python && ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
+	( cd "${ROOT}"/usr/bin && test ! -e python && \
+		ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
 
@@ -1878,7 +1857,8 @@ bootstrap_stage3() {
 	# However for some reason this nm doesn't quite get it on newer
 	# platforms at least, resulting in bugs like #598336.  To cater for
 	# that, get rid of this nm and rely on the host one at this stage
-	[[ ${CHOST} == *-darwin* ]] && rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm
+	[[ ${CHOST} == *-darwin* ]] && \
+		rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm
 
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 
@@ -1952,9 +1932,11 @@ bootstrap_stage3() {
 	# Update the portage tree.
 	treedate=$(date -f "${ROOT}"/usr/portage/metadata/timestamp +%s)
 	nowdate=$(date +%s)
-	[[ ( ! -e ${PORTDIR}/.unpacked ) && $((nowdate - (60 * 60 * 24))) -lt ${treedate} ]] || \
+	[[ ( ! -e ${PORTDIR}/.unpacked ) && \
+		$((nowdate - (60 * 60 * 24))) -lt ${treedate} ]] || \
 	if [[ ${OFFLINE_MODE} ]]; then
-		# --keep used ${DISTDIR}, which make it easier to download a snapshot beforehand
+		# --keep used ${DISTDIR}, which make it easier to download a
+		# snapshot beforehand
 		emerge-webrsync --keep || return 1
 	else
 		emerge --sync || emerge-webrsync || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     cfceb27c37fd5a0979d5c9ed48be7cfe5851f4ae
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 08:39:06 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 08:39:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cfceb27c

scripts/bootstrap-prefix: fix tree snapshot date off by one

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 704062c7e4..35e54ddc87 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -546,7 +546,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20190313"
+	local PV="20190312"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     805094aa7d8756bd7d6a390760b20cabb4d530e8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 08:50:32 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 08:50:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=805094aa

scripts/bootstrap-prefix: try bootstrapping zlib-1.2.11

The latest version of zlib is installed later, so if we can download
just one version, that would be great.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c8a0ae627e..e57e932d0b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1116,6 +1116,7 @@ bootstrap_zlib_core() {
 }
 
 bootstrap_zlib() {
+	bootstrap_zlib_core 1.2.11 || \
 	bootstrap_zlib_core 1.2.8 || bootstrap_zlib_core 1.2.7 || \
 	bootstrap_zlib_core 1.2.6 || bootstrap_zlib_core 1.2.5
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     cf3891762523e572ab3572b7d1eef747ca4d8a60
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 08:49:20 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 08:49:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cf389176

scripts/bootstrap-prefix: bump snapshot

the previous 13 revert was basically reverting the availability of
gcc-8.3 and libressl

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 35e54ddc87..c8a0ae627e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -546,7 +546,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20190312"
+	local PV="20190319"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     db5a9643fd8b27a36179ab275f3cc9e2d2325089
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 10:34:42 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 10:34:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=db5a9643

scripts/bootstrap-prefix: try to bootstrap xz/bzip2 sooner

newer sources are often using xz over gzip, so try to get xz in such
that we can unpack (newer) xz sources.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e57e932d0b..fd110da16c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -707,7 +707,7 @@ bootstrap_gnu() {
 
 	einfo "Bootstrapping ${PN}"
 
-	for t in tar.gz tar.xz tar.bz2 tar ; do
+	for t in tar.xz tar.bz2 tar.gz tar ; do
 		A=${PN}-${PV}.${t}
 
 		# save the user some useless downloading
@@ -1126,6 +1126,7 @@ bootstrap_libffi() {
 }
 
 bootstrap_sed() {
+	bootstrap_gnu sed 4.5 || \
 	bootstrap_gnu sed 4.2.2 || bootstrap_gnu sed 4.2.1
 }
 
@@ -1141,16 +1142,17 @@ bootstrap_grep() {
 	# don't use 2.13, it contains a bug that bites, bug #425668
 	# 2.9 is the last version provided as tar.gz (platforms without xz)
 	# 2.7 is necessary for Solaris/OpenIndiana (2.8, 2.9 fail to configure)
+	bootstrap_gnu grep 3.3 || \
 	bootstrap_gnu grep 2.9 || bootstrap_gnu grep 2.7 || \
-		bootstrap_gnu grep 2.14 || bootstrap_gnu grep 2.12
+	bootstrap_gnu grep 2.14 || bootstrap_gnu grep 2.12
 }
 
 bootstrap_coreutils() {
 	# 8.16 is the last version released as tar.gz
 	# 8.18 is necessary for macOS High Sierra (darwin17) and converted
 	#      to tar.gz for this case
-	bootstrap_gnu coreutils 8.28 || bootstrap_gnu coreutils 8.16 || \
-	bootstrap_gnu coreutils 8.17
+	bootstrap_gnu coreutils 8.30 || bootstrap_gnu coreutils 8.28 || \
+	bootstrap_gnu coreutils 8.16 || bootstrap_gnu coreutils 8.17
 }
 
 bootstrap_tar() {
@@ -1210,6 +1212,7 @@ bootstrap_gzip() {
 }
 
 bootstrap_xz() {
+	GNU_URL=${XZ_URL:-http://tukaani.org} bootstrap_gnu xz 5.2.4 || \
 	GNU_URL=${XZ_URL:-http://tukaani.org} bootstrap_gnu xz 5.2.3
 }
 
@@ -1293,9 +1296,13 @@ bootstrap_stage1() {
 	# packages following (e.g. zlib builds 64-bits)
 
 	# don't rely on $MAKE, if make == gmake packages that call 'make' fail
-	[[ $(make --version 2>&1) == *GNU" Make "4* ]] || (bootstrap_make) || return 1
-	[[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null || (bootstrap_wget) || return 1
+	[[ $(make --version 2>&1) == *GNU" Make "4* ]] \
+		|| (bootstrap_make) || return 1
+	[[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null \
+		|| (bootstrap_wget) || return 1
 	[[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1
+	type -P xz > /dev/null || (bootstrap_xz) || return 1
+	type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1
 	[[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1
 	[[ -x ${ROOT}/tmp/usr/bin/bison ]] \
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
@@ -1305,15 +1312,15 @@ bootstrap_stage1() {
 		|| (bootstrap_coreutils) || return 1
 	[[ $(find --version 2>&1) == *GNU* ]] || (bootstrap_findutils) || return 1
 	[[ $(tar --version 2>&1) == *GNU* ]] || (bootstrap_tar) || return 1
-	[[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] || (bootstrap_patch) || return 1
+	[[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \
+		|| (bootstrap_patch) || return 1
 	[[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1
-	[[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] || bootstrap_gawk || return 1
+	[[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] \
+		|| bootstrap_gawk || return 1
 	# always build our own bash, for we don't know what devilish thing
 	# we're working with now, bug #650284
 	[[ -x ${ROOT}/tmp/usr/bin/bash ]] \
 		|| (bootstrap_bash) || return 1
-	type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1
-	type -P xz > /dev/null || (bootstrap_xz) || return 1
 	# Some host tools need to be wrapped to be useful for us.
 	# We put them in tmp/usr/local/bin, to not accidentally
 	# be identified as stage1-installed like in bug #615410.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8c8b847bbe1297252667b2dbd4187c9b25a9ce92
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 13:14:57 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 13:14:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8c8b847b

scripts/bootstrap-prefix: support multiple mirrors in GENTOO_MIRRORS

This basically aligns behaviour with Portage.  In addition to
GENTOO_MIRRORS now also distfiles.gentoo.org is tried as last resort.
Not sure if that's useful though.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 48 ++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fd110da16c..6f5b44f5d0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -29,7 +29,7 @@ econf() {
 efetch() {
 	if [[ ! -e ${DISTDIR}/${1##*/} ]] ; then
 	  	if [[ ${OFFLINE_MODE} ]]; then
-		  echo "I needed ${1##*/} from $1 or ${GENTOO_MIRRORS}/distfiles/${1##*/} in $DISTDIR"
+		  echo "I need ${1##*/} from $1 in $DISTDIR, can you give it to me?"
 		  read
 		  [[ -e ${DISTDIR}/${1##*/} ]] && return 0
 		  #Give fetch a try 
@@ -40,17 +40,19 @@ efetch() {
 			# curl, FreeBSD's fetch and ftp.
 			if [[ x$(type -t wget) == "xfile" ]] ; then
 				FETCH_COMMAND="wget"
-				[[ $(wget -h) == *"--no-check-certificate"* ]] && FETCH_COMMAND+=" --no-check-certificate"
+				[[ $(wget -h) == *"--no-check-certificate"* ]] \
+					&& FETCH_COMMAND+=" --no-check-certificate"
 			elif [[ x$(type -t curl) == "xfile" ]] ; then
-				einfo "WARNING: curl doesn't fail when downloading fails, please check its output carefully!"
 				FETCH_COMMAND="curl -f -L -O"
 			elif [[ x$(type -t fetch) == "xfile" ]] ; then
 				FETCH_COMMAND="fetch"
 			elif [[ x$(type -t ftp) == "xfile" ]] &&
-				 [[ ${CHOST} != *-cygwin* || ! $(type -P ftp) -ef $(cygpath -S)/ftp ]] ; then
+				 [[ ${CHOST} != *-cygwin* || \
+				 ! $(type -P ftp) -ef $(cygpath -S)/ftp ]] ; then
 				FETCH_COMMAND="ftp"
 			else
-				eerror "no suitable download manager found (need wget, curl, fetch or ftp)"
+				eerror "no suitable download manager found!"
+				eerror "tried: wget, curl, fetch and ftp"
 				eerror "could not download ${1##*/}"
 				exit 1
 			fi
@@ -59,10 +61,22 @@ efetch() {
 		mkdir -p "${DISTDIR}" >& /dev/null
 		einfo "Fetching ${1##*/}"
 		pushd "${DISTDIR}" > /dev/null
-		# try for mirrors first, then try given location
-		${FETCH_COMMAND} "${GENTOO_MIRRORS}/distfiles/${1##*/}" < /dev/null
-		[[ ! -f ${1##*/} && ${1} != ${GENTOO_MIRRORS}/distfiles/${1##*/} ]] \
-			&& ${FETCH_COMMAND} "$1" < /dev/null
+
+		# try for mirrors first, fall back to distfiles, then try given location
+		local locs=( )
+		local loc
+		for loc in ${GENTOO_MIRRORS} ${DISTFILES_G_O} ; do
+			locs=(
+				"${locs[@]}"
+				"${loc}/distfiles/${1##*/}"
+			)
+		done
+		locs=( "${locs[@]}" "$1" )
+
+		for loc in "${locs[@]}" ; do
+			${FETCH_COMMAND} "${loc}" < /dev/null
+			[[ -f ${1##*/} ]] && break
+		done
 		if [[ ! -f ${1##*/} ]] ; then
 			eerror "downloading ${1} failed!"
 			return 1
@@ -751,16 +765,17 @@ bootstrap_gnu() {
 		local p patchopts
 		for p in \
 			"-p0" \
-			"${GENTOO_MIRRORS}/distfiles/bash43-"{001..048} \
+			"${DISTFILES_G_O}/distfiles/bash43-"{001..048} \
 			"-p2" \
-			https://dev.gentoo.org/~haubi/distfiles/bash-4.3_p39-cygwin-r2.patch \
+			"https://dev.gentoo.org/~haubi/distfiles/bash-4.3_p39-cygwin-r2.patch" \
 		; do
 			if [[ ${p} == -* ]] ; then
 				patchopts=${p}
 				continue
 			fi
 			efetch "${p}" || return 1
-			patch --forward --no-backup-if-mismatch ${patchopts} < "${DISTDIR}/${p##*/}" || return 1
+			patch --forward --no-backup-if-mismatch ${patchopts} \
+				< "${DISTDIR}/${p##*/}" || return 1
 		done
 	fi
 
@@ -1039,7 +1054,7 @@ bootstrap_zlib_core() {
 
 	einfo "Bootstrapping ${A%-*}"
 
-	efetch ${GENTOO_MIRRORS}/distfiles/${A} || return 1
+	efetch ${DISTFILES_G_O}/distfiles/${A} || return 1
 
 	einfo "Unpacking ${A%%-*}"
 	export S="${PORTAGE_TMPDIR}/zlib-${PV}"
@@ -1151,7 +1166,7 @@ bootstrap_coreutils() {
 	# 8.16 is the last version released as tar.gz
 	# 8.18 is necessary for macOS High Sierra (darwin17) and converted
 	#      to tar.gz for this case
-	bootstrap_gnu coreutils 8.30 || bootstrap_gnu coreutils 8.28 || \
+	bootstrap_gnu coreutils 8.30 || \
 	bootstrap_gnu coreutils 8.16 || bootstrap_gnu coreutils 8.17
 }
 
@@ -1223,7 +1238,7 @@ bootstrap_bzip2() {
 	A=${PN}-${PV}.tar.gz
 	einfo "Bootstrapping ${A%-*}"
 
-	efetch ${GENTOO_MIRRORS}/distfiles/${A} || return 1
+	efetch ${DISTFILES_G_O}/distfiles/${A} || return 1
 
 	einfo "Unpacking ${A%-*}"
 	S="${PORTAGE_TMPDIR}/${PN}-${PV}"
@@ -1986,7 +2001,8 @@ set_helper_vars() {
 	PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/var/tmp}
 	DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
 	GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
-	GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
+	DISTFILES_G_O="http://distfiles.gentoo.org"
+	GENTOO_MIRRORS=${GENTOO_MIRRORS:=${DISTFILES_G_O}}
 	SNAPSHOT_HOST=$(rapx ${GENTOO_MIRRORS} http://rsync.prefix.bitzolder.nl)
 	SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
 	GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5107368437df6964ba4c2567de9e13bb988912c6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 14:52:06 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 14:52:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=51073684

scripts/bootstrap-prefix: bootstrap libressl for wget to use

Somewhat experimental, but optional (e.g. if it fails should not abort
the bootstrap) bootstrap of libressl so wget can link against it to
enable https:// support.  Tested on powerpc-apple-darwin9.

Bug: https://bugs.gentoo.org/644372
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 57 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6f5b44f5d0..7cb83cf84d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -13,8 +13,13 @@ rapx() { is-rap && echo $1 || echo $2; }
 
 ## Functions Start Here
 
+v() {
+	echo "$@"
+	"$@"
+}
+
 econf() {
-	${CONFIG_SHELL} ./configure \
+	v ${CONFIG_SHELL} ./configure \
 		--host=${CHOST} \
 		--prefix="${ROOT}"/tmp/usr \
 		--mandir="${ROOT}"/tmp/usr/share/man \
@@ -65,7 +70,7 @@ efetch() {
 		# try for mirrors first, fall back to distfiles, then try given location
 		local locs=( )
 		local loc
-		for loc in ${GENTOO_MIRRORS} ${DISTFILES_G_O} ; do
+		for loc in ${GENTOO_MIRRORS} ; do
 			locs=(
 				"${locs[@]}"
 				"${loc}/distfiles/${1##*/}"
@@ -74,7 +79,7 @@ efetch() {
 		locs=( "${locs[@]}" "$1" )
 
 		for loc in "${locs[@]}" ; do
-			${FETCH_COMMAND} "${loc}" < /dev/null
+			v ${FETCH_COMMAND} "${loc}" < /dev/null
 			[[ -f ${1##*/} ]] && break
 		done
 		if [[ ! -f ${1##*/} ]] ; then
@@ -806,7 +811,8 @@ bootstrap_gnu() {
 	# Darwin9 in particular doesn't compile when using system readline,
 	# but we don't need any groovy input at all, so just disable it,
 	# except for Cygwin, where the patch above would fail to compile
-	[[ ${PN} == "bash" && ${CHOST} != *-cygwin* ]] && myconf="${myconf} --disable-readline"
+	[[ ${PN} == "bash" && ${CHOST} != *-cygwin* ]] \
+		&& myconf="${myconf} --disable-readline"
 
 	# ensure we don't read system-wide shell initialisation, it may
 	# contain cruft, bug #650284
@@ -819,11 +825,30 @@ bootstrap_gnu() {
 	# coreutils completely useless (install failing on everything)
 	# Don't try using gmp either, it may be that just the library is
 	# there, and if so, the buildsystem assumes the header exists too
-	[[ ${PN} == "coreutils" ]] && \
+	# stdbuf is giving many problems, and we don't really care about it
+	# at this level, so disable it too
+	if [[ ${PN} == "coreutils" ]] ; then
 		myconf="${myconf} --disable-acl --without-gmp"
+		myconf="${myconf} --enable-no-install-program=stdbuf"
+	fi
 
 	# Gentoo Bug 400831, fails on Ubuntu with libssl-dev installed
-	[[ ${PN} == "wget" ]] && myconf="${myconf} --without-ssl"
+	if [[ ${PN} == "wget" ]] ; then
+		if [[ -x ${ROOT}/tmp/usr/bin/openssl ]] ; then
+			myconf="${myconf} --with-ssl=openssl"
+			myconf="${myconf} --with-libssl-prefix=${ROOT}/tmp/usr"
+			export CPPFLAGS="${CPPFLAGS} -I${ROOT}/tmp/usr/include"
+			export LDFLAGS="${LDFLAGS} -L${ROOT}/tmp/usr/lib"
+		else
+			myconf="${myconf} --without-ssl"
+		fi
+	fi
+
+	# for libressl, only provide static lib, such that wget (above)
+	# links it in and we don't have to bother about RPATH or something
+	if [[ ${PN} == "libressl" ]] ; then
+		myconf="${myconf} --enable-static --disable-shared"
+	fi
 
 	# SuSE 11.1 has GNU binutils-2.20, choking on crc32_x86
 	[[ ${PN} == "xz" ]] && myconf="${myconf} --disable-assembler"
@@ -848,16 +873,16 @@ bootstrap_gnu() {
 	einfo "Compiling ${PN}"
 	econf ${myconf} || return 1
 	if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then
-		./build.sh || return 1
+		v ./build.sh || return 1
 	else
-		$MAKE ${MAKEOPTS} || return 1
+		v $MAKE ${MAKEOPTS} || return 1
 	fi
 
 	einfo "Installing ${PN}"
 	if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then
-		./make install MAKE="${S}/make" || return 1
+		v ./make install MAKE="${S}/make" || return 1
 	else
-		$MAKE install || return 1
+		v $MAKE install || return 1
 	fi
 
 	cd "${ROOT}"
@@ -1150,6 +1175,7 @@ bootstrap_findutils() {
 }
 
 bootstrap_wget() {
+	bootstrap_gnu wget 1.20.1 || \
 	bootstrap_gnu wget 1.17.1 || bootstrap_gnu wget 1.13.4
 }
 
@@ -1211,8 +1237,8 @@ bootstrap_bash() {
 
 bootstrap_bison() {
 	bootstrap_gnu bison 2.6.2 || bootstrap_gnu bison 2.6.1 || \
-		bootstrap_gnu bison 2.6 || bootstrap_gnu bison 2.5.1 || \
-		bootstrap_gnu bison 2.4
+	bootstrap_gnu bison 2.6 || bootstrap_gnu bison 2.5.1 || \
+	bootstrap_gnu bison 2.4
 }
 
 bootstrap_m4() {
@@ -1260,6 +1286,11 @@ bootstrap_bzip2() {
 	einfo "${A%-*} successfully bootstrapped"
 }
 
+bootstrap_libressl() {
+	GNU_URL="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL" \
+		bootstrap_gnu libressl 2.8.3
+}
+
 bootstrap_stage_host_gentoo() {
 	if ! is-rap ; then
 		einfo "Shortcut only supports prefix-standalone, but we are bootstrapping"
@@ -1313,6 +1344,8 @@ bootstrap_stage1() {
 	# don't rely on $MAKE, if make == gmake packages that call 'make' fail
 	[[ $(make --version 2>&1) == *GNU" Make "4* ]] \
 		|| (bootstrap_make) || return 1
+	[[ ${OFFLINE_MODE} ]] || [[ -x ${ROOT}/tmp/usr/bin/openssl ]] \
+		|| (bootstrap_libressl) # do not fail if this fails, we'll try without
 	[[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null \
 		|| (bootstrap_wget) || return 1
 	[[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     01c51c1f3c8868e6b8c6a59c84304d971cd4aea7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 08:01:44 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 08:01:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=01c51c1f

scripts/bootstrap-prefix: ensure we don't use mirrors for latest tree

In do_tree, ensure that we don't end up using mirrors to fetch a daily
snapshot.  The purpose of those is to be fresh, so we don't want a stale
copy.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7cb83cf84d..c91f6393e4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -554,10 +554,18 @@ do_tree() {
 
 	mkdir -p "${PORTDIR}"
 	if [[ ! -e ${PORTDIR}/.unpacked ]]; then
-		efetch "$1/$2" || return 1
+		# latest tree cannot be fetched from mirrors, always have to
+		# respect the source to get the latest
+		if [[ -n ${LATEST_TREE_YES} ]] ; then
+			echo "$1"
+			( export GENTOO_MIRRORS= ; efetch "$1/$2" ) || return 1
+		else
+			efetch "$1/$2" || return 1
+		fi
 		[[ -e ${PORTDIR} ]] || mkdir -p ${PORTDIR}
 		einfo "Unpacking, this may take a while"
-		bzip2 -dc ${DISTDIR}/$2 | tar -xf - -C ${PORTDIR} --strip-components=1 || return 1
+		bzip2 -dc ${DISTDIR}/$2 | \
+			tar -xf - -C ${PORTDIR} --strip-components=1 || return 1
 		touch ${PORTDIR}/.unpacked
 	fi
 }
@@ -2036,7 +2044,7 @@ set_helper_vars() {
 	GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
 	DISTFILES_G_O="http://distfiles.gentoo.org"
 	GENTOO_MIRRORS=${GENTOO_MIRRORS:=${DISTFILES_G_O}}
-	SNAPSHOT_HOST=$(rapx ${GENTOO_MIRRORS} http://rsync.prefix.bitzolder.nl)
+	SNAPSHOT_HOST=$(rapx ${DISTFILES_G_O} http://rsync.prefix.bitzolder.nl)
 	SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
 	GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     f8c03c3512c1f2d2b9db7ac92fe02ee5df031dce
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 11:31:18 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 11:53:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f8c03c35

bootstrap-prefix.sh: set USE=prefix-stack

Keep FEATURES=stacked-prefix until we bumped stage1 portage as well.
Bug: https://bugs.gentoo.org/658572

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c91f6393e4..94040d941d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1802,7 +1802,9 @@ bootstrap_stage3() {
 	}
 
 	with_stack_emerge_pkgs() {
+		# keep FEATURES=stacked-prefix until we bump portage in stage1
 		FEATURES="${FEATURES} stacked-prefix" \
+		USE="${USE} prefix-stack" \
 		PORTAGE_OVERRIDE_EPREFIX="${ROOT}/tmp" \
 		emerge_pkgs "$@"
 	}
@@ -1976,7 +1978,7 @@ bootstrap_stage3() {
 	)
 
 	# Bug 655414, 676096.
-	# Enough packages emerged using stacked-prefix with tmp/ as base prefix
+	# Enough packages emerged with USE=prefix-stack with tmp/ as base prefix
 	# to allow for sys-apps/portage itself and dependencies without any
 	# dependency into tmp/ now.
 	# Portage does search it's global config using PORTAGE_OVERRIDE_EPREFIX,

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     032ef433319e81ca59fd4e064059fab3dc11bada
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 17:12:30 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 17:16:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=032ef433

bootstrap-prefix.sh: emerging prefix-toolkit if available

Still create /startprefix when app-portage/prefix-toolkit is not
available in the tree.

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 94040d941d..7d6d808d87 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -607,22 +607,27 @@ bootstrap_startscript() {
 		eerror "automate starting your prefix, set SHELL and rerun this script" > /dev/stderr
 		return 1
 	fi
-	einfo "Creating the Prefix start script (startprefix)"
-	# currently I think right into the prefix is the best location, as
-	# putting it in /bin or /usr/bin just hides it some more for the
-	# user
-	if is-rap ; then
-		mkdir -p "${ROOT}"/usr/portage/scripts
-		wget $([[ $(wget -h) == *"--no-check-certificate"* ]] && echo --no-check-certificate) \
-		     https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/startprefix.in \
-		     -O "${ROOT}"/usr/portage/scripts/startprefix.in
-	fi
+	if [[ -d ${ROOT}/usr/portage/app-portage/prefix-toolkit ]] ; then
+		einfo "Finally, emerging prefix-toolkit for your convenience"
+		emerge -u app-portage/prefix-toolkit || return 1
+	else
+		einfo "Creating the Prefix start script (startprefix)"
+		# currently I think right into the prefix is the best location, as
+		# putting it in /bin or /usr/bin just hides it some more for the
+		# user
+		if is-rap ; then
+			mkdir -p "${ROOT}"/usr/portage/scripts
+			wget $([[ $(wget -h) == *"--no-check-certificate"* ]] && echo --no-check-certificate) \
+				 https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/startprefix.in \
+				 -O "${ROOT}"/usr/portage/scripts/startprefix.in
+		fi
 
-	sed \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \
-		"${ROOT}"/usr/portage/scripts/startprefix.in \
-		> "${ROOT}"/startprefix
-	chmod 755 "${ROOT}"/startprefix
+		sed \
+			-e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \
+			"${ROOT}"/usr/portage/scripts/startprefix.in \
+			> "${ROOT}"/startprefix
+		chmod 755 "${ROOT}"/startprefix
+	fi
 	einfo "To start Gentoo Prefix, run the script ${ROOT}/startprefix"
 	einfo "You can copy this file to a more convenient place if you like."
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     34b9d43ea8ba18e485df1430b2153cad7561e653
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 18:16:07 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 18:16:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=34b9d43e

scripts/bootstrap-prefix: drop bit about copying startprefix around

Now the package is supposed to come from app-portage/prefix-toolkit, it
defeats the purpose if people copy it (thus not receiving any updates).

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7d6d808d87..1f5d8fe2db 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -629,7 +629,6 @@ bootstrap_startscript() {
 		chmod 755 "${ROOT}"/startprefix
 	fi
 	einfo "To start Gentoo Prefix, run the script ${ROOT}/startprefix"
-	einfo "You can copy this file to a more convenient place if you like."
 
 	# see if PATH is kept/respected
 	local minPATH="preamble:${BASH%/*}:postlude"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e59e183f146aeb056ef3625bf965073f968b7265
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 16:25:31 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 16:25:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e59e183f

scripts/bootstrap-prefix: bump snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1f5d8fe2db..4149f661f1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20190319"
+	local PV="20190326"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     6a100e41bd7c18939115d4709bd4d7f3deb5117c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 08:13:34 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May  5 08:15:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6a100e41

scripts/bootstrap-prefix: pick up SmartOS GCC7, bug #685082

As reported by Tim Boudreau, recent SmartOS uses GCC7.  Don't do any
cleverness with globbing for now.

Closes: https://bugs.gentoo.org/685082
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3c4f7dbde7..bd687483a5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2284,6 +2284,7 @@ EOF
 			# OpenIndiana 151a5
 			[[ -d /usr/gnu/bin ]] && PATH="${PATH}:/usr/gnu/bin"
 			# SmartOS
+			[[ -d /opt/local/gcc7/bin ]] && PATH="${PATH}:/opt/local/gcc7/bin"
 			[[ -d /opt/local/gcc47/bin ]] && PATH="${PATH}:/opt/local/gcc47/bin"
 			;;
 		*-darwin1*)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     66f46063dd050dce3335db6b9200dcaf64826ff2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 11:18:25 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May  5 08:15:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=66f46063

scripts/bootstrap-prefix: add initial FreeBSD support

This is mostly non-functional, since FreeBSD/Prefix profiles are
missing.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4149f661f1..3c4f7dbde7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -181,6 +181,9 @@ configure_toolchain() {
 	*-darwin*)
 	  # handled below
 	  ;;
+	*-freebsd*)
+	  # comes with clang, handled below
+	  ;;
 	*)
 	  # The host may not have a functioning c++ toolchain, so use a
 	  # stage1 compiler that can build with C only.
@@ -318,6 +321,11 @@ configure_toolchain() {
 				sys-devel/llvm
 				sys-devel/clang"
 			;;
+		*-freebsd*)
+			CC=clang
+			CXX=clang++
+			# TODO: target clang toolchain someday?
+			;;
 		*-solaris*)
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
 			case "${ccvers}" in
@@ -2290,7 +2298,7 @@ EOF
 	esac
 
 	# TODO: should we better use cc here? or check both?
-	if ! type -P gcc > /dev/null ; then
+	if ! type -P gcc > /dev/null && ! type -P clang > /dev/null ; then
 		case "${CHOST}" in
 			*-darwin*)
 				cat << EOF
@@ -2420,6 +2428,7 @@ EOF
 	case "${CHOST}" in
 		*-cygwin*)     ncpu=$(cmd /D /Q /C 'echo %NUMBER_OF_PROCESSORS%' | tr -d "\\r") ;;
 		*-darwin*)     ncpu=$(/usr/sbin/sysctl -n hw.ncpu)                 ;;
+		*-freebsd*)    ncpu=$(/sbin/sysctl -n hw.ncpu)                     ;;
 		*-solaris*)    ncpu=$(/usr/sbin/psrinfo | wc -l)                   ;;
 		*-linux-gnu*)  ncpu=$(cat /proc/cpuinfo | grep processor | wc -l)  ;;
 		*-aix*)        ncpu=$(/usr/sbin/bindprocessor -q | cut -d: -f2 | wc -w) ;;
@@ -2925,6 +2934,13 @@ if [[ -z ${CHOST} ]]; then
 			CYGWIN*)
 				CHOST="`uname -m`-pc-cygwin"
 				;;
+			FreeBSD)
+				case `uname -m` in
+					amd64)
+						CHOST="x86_64-pc-freebsd`uname -r | sed 's|-.*$||'`"
+					;;
+				esac
+				;;
 			*)
 				eerror "Nothing known about platform `uname -s`."
 				eerror "Please set CHOST appropriately for your system"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     52ae87352bd7dfa3058db673626de071202457d7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 17:30:29 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 22 17:30:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=52ae8735

scripts/bootstrap-prefix: use python-3.6 to bootstrap stage1

Use vanilla Python-3.6.8 to bootstrap stage1, dropped Cygwin bits for
they no longer applied.  We should consider using the cygwin release for
that.

Bug: https://bugs.gentoo.org/686522
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 75 ++++++---------------------------------------
 1 file changed, 10 insertions(+), 65 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bd687483a5..f4c71332ac 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -911,20 +911,9 @@ bootstrap_gnu() {
 }
 
 bootstrap_python() {
-	PV=2.7.3
-
-	case $CHOST in
-		*-*-aix*)
-			# TODO: freebsd 10 also seems to need this
-			PV=2.7.15
-			A=Python-${PV}.tar.xz # patched one breaks
-			patch=true
-		;;
-		*)
-			A=python-${PV}-patched.tar.bz2
-			patch=false
-		;;
-	esac
+	PV=3.6.8
+	A=Python-${PV}.tar.xz
+	patch=true
 
 	einfo "Bootstrapping ${A%-*}"
 
@@ -951,55 +940,11 @@ bootstrap_python() {
 	if ${patch}; then
 		# This patch is critical and needs to be applied even
 		# when using the otherwise unpatched sources.
-		efetch "http://dev.gentoo.org/~haubi/distfiles/02_all_disable_modules_and_ssl.patch"
-		patch -p0 < "${DISTDIR}"/02_all_disable_modules_and_ssl.patch
+		efetch "http://dev.gentoo.org/~grobian/distfiles/python-3.6-02_all_disable_modules_and_ssl.patch"
+		patch -p0 < "${DISTDIR}"/python-3.6-02_all_disable_modules_and_ssl.patch
 	fi
 
-	# ./Python/ dir hides ./python.exe on Cygwin.
-	# With dlltool, find_library("c") can return "cygwin1.dll".
-	patch -p0 <<'EOP'
---- Modules/getpath.c
-+++ Modules/getpath.c
-@@ -436,6 +436,15 @@
-                         if (isxfile(progpath))
-                                 break;
- 
-+#ifdef __CYGWIN__
-+                        if (isdir(progpath)) {
-+                                /* found /.../Python/ but want /.../python.exe */
-+                                strncat(progpath, ".exe", MAXPATHLEN - strlen(progpath));
-+                                if (isxfile(progpath))
-+                                        break;
-+                        }
-+#endif /* __CYGWIN__ */
-+
-                         if (!delim) {
-                                 progpath[0] = '\0';
-                                 break;
---- Lib/ctypes/util.py
-+++ Lib/ctypes/util.py
-@@ -41,6 +41,20 @@
-                 continue
-         return None
- 
-+elif sys.platform == "cygwin":
-+    def find_library(name):
-+        for libdir in ['/usr/lib', '/usr/local/lib']:
-+            for libext in ['lib%s.dll.a' % name, 'lib%s.a' % name]:
-+                implib = os.path.join(libdir, libext)
-+                if not os.path.exists(implib):
-+                    continue
-+                cmd = "dlltool -I " + implib + " 2>/dev/null"
-+                res = os.popen(cmd).read().replace("\n","")
-+                if not res:
-+                    continue
-+                return res
-+        return None
-+
- elif os.name == "posix":
-     # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump
-     import re, tempfile, errno
-EOP
+	# Cygwin TODO: use cygwin python sources here?
 	local myconf=""
 
 	case $CHOST in
@@ -1067,13 +1012,13 @@ EOP
 
 	einfo "Compiling ${A%-*}"
 
-	#some ancient versions of hg fail with "hg id -i", so help configure to not find them
-	# do not find libffi via pkg-config
+	# some ancient versions of hg fail with "hg id -i", so help
+	# configure to not find them using HAS_HG
+	# do not find libffi via pkg-config using PKG_CONFIG
 	HAS_HG=no \
 	PKG_CONFIG= \
 	econf \
 		--with-system-ffi \
-		--disable-toolbox-glue \
 		--disable-ipv6 \
 		--disable-shared \
 		--libdir="${ROOT}"/tmp/usr/lib \
@@ -1705,7 +1650,7 @@ bootstrap_stage2() {
 		MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 		GCC_MAKE_TARGET=all \
 		TPREFIX="${ROOT}" \
-		PYTHON_COMPAT_OVERRIDE=python2.7 \
+		PYTHON_COMPAT_OVERRIDE=python3.6 \
 		emerge_pkgs --nodeps ${pkg} || return 1
 
 		if [[ "${pkg}" == *sys-devel/llvm* || ${pkg} == *sys-devel/clang* ]] ;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8296909f7deadd1ba2f5759a61395bbdd3bc31ad
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 20:07:22 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 22 20:07:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8296909f

scripts/bootstrap-prefix: fix all refs to python version

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f4c71332ac..b213cb7a3b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -910,6 +910,7 @@ bootstrap_gnu() {
 	einfo "${PN}-${PV} successfully bootstrapped"
 }
 
+PYTHONMAJMIN=3.6   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
 	PV=3.6.8
 	A=Python-${PV}.tar.xz
@@ -1650,7 +1651,7 @@ bootstrap_stage2() {
 		MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 		GCC_MAKE_TARGET=all \
 		TPREFIX="${ROOT}" \
-		PYTHON_COMPAT_OVERRIDE=python3.6 \
+		PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \
 		emerge_pkgs --nodeps ${pkg} || return 1
 
 		if [[ "${pkg}" == *sys-devel/llvm* || ${pkg} == *sys-devel/clang* ]] ;
@@ -1721,10 +1722,10 @@ bootstrap_stage3() {
 	# if we resume this stage and python-exec was installed already in
 	# tmp, we basically made the system unusable, so remove python-exec
 	# here so we can use the python in tmp
-	for pef in python{,2} python{,2}-config ; do
+	for pef in python{,3} python{,3}-config ; do
 		rm -f "${ROOT}"/tmp/usr/bin/${pef}
 		[[ ${pef} == *-config ]] && ppf=-config || ppf=
-		( cd "${ROOT}"/tmp/usr/bin && ln -s python2.7${ppf} ${pef} )
+		( cd "${ROOT}"/tmp/usr/bin && ln -s python${PYTHONMAJMIN}${ppf} ${pef} )
 	done
 
 	get_libdir() {
@@ -1849,9 +1850,9 @@ bootstrap_stage3() {
 	# setup for a scenario where python doesn't live in the target
 	# prefix and no helpers are available
 	( cd "${ROOT}"/usr/bin && test ! -e python && \
-		ln -s "${ROOT}"/tmp/usr/bin/python2.7 )
+		ln -s "${ROOT}"/tmp/usr/bin/python${PYTHONMAJMIN} )
 	# in addition, avoid collisions
-	rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang
+	rm -Rf "${ROOT}"/tmp/usr/lib/python${PYTHONMAJMIN}/site-packages/clang
 
 	# llvm-3.5 doesn't find C++11 headers/lib by default, make it so
 	if [[ ${CHOST} == *-darwin9 ]] ; then
@@ -1869,7 +1870,7 @@ bootstrap_stage3() {
 	# try to get ourself out of the mudd, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \
 	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
-	PYTHON_COMPAT_OVERRIDE=python2.7 \
+	PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \
 	with_stack_emerge_pkgs --nodeps ${compiler} || return 1
 	# undo libgcc_s.so path of stage2
 
@@ -1885,7 +1886,7 @@ bootstrap_stage3() {
 
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 
-	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python2.7 )
+	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python${PYTHONMAJMIN} )
 	# Use $ROOT tools where possible from now on.
 	if [[ $(readlink "${ROOT}"/bin/sh) == "${ROOT}/tmp/"* ]] ; then
 		rm -f "${ROOT}"/bin/sh

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     c6c9d0a9d44b8d17e843306c2ebb2c775b2e7840
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 06:42:14 2019 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat May 25 06:15:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c6c9d0a9

scripts/bootstrap-prefix.sh: consistant stage2 compiler and linker.

  The host linker might not work well with stage2 compiler.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b213cb7a3b..b3ab8cb4bb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1818,10 +1818,6 @@ bootstrap_stage3() {
 		export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
 		BOOTSTRAP_RAP=yes \
 		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
-
-		# remove stage2 ld so that stage3 ld is used by stage2 gcc.
-		[[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && \
-			mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
 	else
 		pkgs=(
 			sys-apps/gentoo-functions
@@ -1838,6 +1834,9 @@ bootstrap_stage3() {
 
 		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	fi
+	# remove stage2 ld so that stage3 ld is used by stage2 gcc.
+	is-rap && [[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && \
+		mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
 
 	# On some hosts, gcc gets confused now when it uses the new linker,
 	# see for instance bug #575480.  While we would like to hide that

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     263c4d2298d7a6c0d1cc778a4933a47088ceaadb
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 09:39:02 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon May 27 09:42:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=263c4d22

bootstrap-prefix.sh (stage1 python-3.6.8): apply cygwin patches

Using cygwinports patches for stage1 python much like the ebuild does.
Bug: https://bugs.gentoo.org/686522
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b3ab8cb4bb..224fbb5ba3 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -945,7 +945,34 @@ bootstrap_python() {
 		patch -p0 < "${DISTDIR}"/python-3.6-02_all_disable_modules_and_ssl.patch
 	fi
 
-	# Cygwin TODO: use cygwin python sources here?
+	case ${CHOST} in
+	(*-*-cygwin*)
+		# apply patches from cygwinports much like the ebuild does
+		local gitrev pf pn
+		gitrev="71f2ac2444946c97d892be3892e47d2a509e0e96" # python36 3.6.8
+		efetch "https://github.com/cygwinports/python36/archive/${gitrev}.tar.gz" \
+			|| return 1
+		gzip -dc "${DISTDIR}"/${gitrev}.tar.gz | tar -xf -
+		[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
+		for pf in $(
+			sed -ne '/PATCH_URI="/,/"/{s/.*="//;s/".*$//;p}' \
+			< python36-${gitrev}/python3.cygport
+		); do
+			pf="python36-${gitrev}/${pf}"
+			for pn in {1..2} fail; do
+				if [[ ${pn} == fail ]]; then
+					eerror "failed to apply ${pf}"
+					return 1
+				fi
+				patch -N -p${pn} -i "${pf}" --dry-run >/dev/null 2>&1 || continue
+				echo "applying (-p${pn}) ${pf}"
+				patch -N -p${pn} -i "${pf}" || return 1
+				break
+			done
+		done
+		;;
+	esac
+
 	local myconf=""
 
 	case $CHOST in

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     98ec2081186ec227a303ea48b7532646b5938271
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 12:21:01 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 28 12:21:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=98ec2081

scripts/bootstrap-prefix: fix bootstrap_python on Solaris 10

GCC 3.4.3 used by Solaris 10 doesn't quite grok the HUGE_VAL and isnan()
bits (more exactly they lead to strange errors) so replace them with
fallbacks.  The final Python will obviously be compiled with a more
recent compiler that handles said constructs just fine.

confirmed not to break with i386-pc-solaris2.11/20190527, bootstrap in
progress (beyond bootstrap_python running Portage now) for
sparc-sun-solaris2.10.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 224fbb5ba3..23b3ec412c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -945,6 +945,18 @@ bootstrap_python() {
 		patch -p0 < "${DISTDIR}"/python-3.6-02_all_disable_modules_and_ssl.patch
 	fi
 
+	# Solaris' host compiler (if old -- 3.4.3) doesn't grok HUGE_VAL,
+	# and barfs on isnan() so patch it out
+	case ${CHOST} in
+	(*-solaris*)
+		sed -i \
+			-e '/^#define Py_HUGE_VAL/s/HUGE_VAL$/(__builtin_huge_val())/' \
+			-e '/defined HAVE_DECL_ISNAN/s/ISNAN/USE_FALLBACK/' \
+			Include/pymath.h
+		;;
+	esac
+
+
 	case ${CHOST} in
 	(*-*-cygwin*)
 		# apply patches from cygwinports much like the ebuild does

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d095e517c36eda7dd2954d914a9d577c455c7566
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 14:34:21 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May 31 14:34:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d095e517

scripts/bootstrap-prefix: add workaround for Darwin9 in bootstrap_python

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 23b3ec412c..d5bfd04ca8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -945,18 +945,6 @@ bootstrap_python() {
 		patch -p0 < "${DISTDIR}"/python-3.6-02_all_disable_modules_and_ssl.patch
 	fi
 
-	# Solaris' host compiler (if old -- 3.4.3) doesn't grok HUGE_VAL,
-	# and barfs on isnan() so patch it out
-	case ${CHOST} in
-	(*-solaris*)
-		sed -i \
-			-e '/^#define Py_HUGE_VAL/s/HUGE_VAL$/(__builtin_huge_val())/' \
-			-e '/defined HAVE_DECL_ISNAN/s/ISNAN/USE_FALLBACK/' \
-			Include/pymath.h
-		;;
-	esac
-
-
 	case ${CHOST} in
 	(*-*-cygwin*)
 		# apply patches from cygwinports much like the ebuild does
@@ -983,6 +971,22 @@ bootstrap_python() {
 			done
 		done
 		;;
+	(*-solaris*)
+		# Solaris' host compiler (if old -- 3.4.3) doesn't grok HUGE_VAL,
+		# and barfs on isnan() so patch it out
+		sed -i \
+			-e '/^#define Py_HUGE_VAL/s/HUGE_VAL$/(__builtin_huge_val())/' \
+			-e '/defined HAVE_DECL_ISNAN/s/ISNAN/USE_FALLBACK/' \
+			Include/pymath.h
+		;;
+	(*-darwin9)
+		# Darwin 9's kqueue seems to act up (at least at this stage), so
+		# make Python's selectors resort to poll() or select() for the
+		# time being
+		sed -i \
+			-e 's/KQUEUE/KQUEUE_DISABLED/' \
+			configure
+		;;
 	esac
 
 	local myconf=""

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a4f719dc7d358e783d878982f88a97e6bea5753c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 18:54:56 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 18:54:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a4f719dc

scripts/bootstrap-prefix: adapt PORTDIR and DISTDIR to new locations

use PORTDIR consistently, and update to new locations now we're
bootstrapping with a newer Portage that uses the new locations:

PORTDIR=${EPREFIX}/var/db/repos/gentoo
DISTDIR=${EPREFIX}/var/cache/distfiles

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d5bfd04ca8..3b4e648d0a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -581,7 +581,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20190326"
+	local PV="20190602"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -615,7 +615,7 @@ bootstrap_startscript() {
 		eerror "automate starting your prefix, set SHELL and rerun this script" > /dev/stderr
 		return 1
 	fi
-	if [[ -d ${ROOT}/usr/portage/app-portage/prefix-toolkit ]] ; then
+	if [[ -d ${PORTDIR}/app-portage/prefix-toolkit ]] ; then
 		einfo "Finally, emerging prefix-toolkit for your convenience"
 		emerge -u app-portage/prefix-toolkit || return 1
 	else
@@ -624,15 +624,15 @@ bootstrap_startscript() {
 		# putting it in /bin or /usr/bin just hides it some more for the
 		# user
 		if is-rap ; then
-			mkdir -p "${ROOT}"/usr/portage/scripts
+			mkdir -p "${PORTDIR}"/scripts
 			wget $([[ $(wget -h) == *"--no-check-certificate"* ]] && echo --no-check-certificate) \
 				 https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/startprefix.in \
-				 -O "${ROOT}"/usr/portage/scripts/startprefix.in
+				 -O "${PORTDIR}"/scripts/startprefix.in
 		fi
 
 		sed \
 			-e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \
-			"${ROOT}"/usr/portage/scripts/startprefix.in \
+			"${PORTDIR}"/scripts/startprefix.in \
 			> "${ROOT}"/startprefix
 		chmod 755 "${ROOT}"/startprefix
 	fi
@@ -666,8 +666,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.52.2"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.52.2"
+	STABLE_PV="2.3.67"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.67"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"
@@ -725,7 +725,8 @@ bootstrap_portage() {
 	# in Prefix the sed wrapper is deadly, so kill it
 	rm -f "${ROOT}"/tmp/usr/lib/portage/bin/ebuild-helpers/sed
 
-	[[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" "${ROOT}"/tmp/usr/portage
+	local tmpportdir=${ROOT}/tmp/${PORTDIR#${ROOT}}
+	[[ -e "${tmpportdir}" ]] || ln -s "${PORTDIR}" "${tmpportdir}"
 	for d in "${ROOT}"/tmp/usr/lib/python?.?; do
 		[[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/portage ${d}/portage
 		[[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/_emerge ${d}/_emerge
@@ -1996,7 +1997,7 @@ bootstrap_stage3() {
 	hash -r
 
 	# Update the portage tree.
-	treedate=$(date -f "${ROOT}"/usr/portage/metadata/timestamp +%s)
+	treedate=$(date -f "${PORTDIR}"/metadata/timestamp +%s)
 	nowdate=$(date +%s)
 	[[ ( ! -e ${PORTDIR}/.unpacked ) && \
 		$((nowdate - (60 * 60 * 24))) -lt ${treedate} ]] || \
@@ -2039,8 +2040,8 @@ bootstrap_stage3_log() {
 
 set_helper_vars() {
 	CXXFLAGS="${CXXFLAGS:-${CFLAGS}}"
-	export PORTDIR=${PORTDIR:-"${ROOT}/usr/portage"}
-	export DISTDIR=${DISTDIR:-"${PORTDIR}/distfiles"}
+	export PORTDIR=${PORTDIR:-"${ROOT}/var/db/repos/gentoo"}
+	export DISTDIR=${DISTDIR:-"${ROOT}/var/cache/distfiles"}
 	PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/var/tmp}
 	DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
 	GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
@@ -2747,7 +2748,7 @@ EOF
 It seems one of your logs indicates a download problem due to missing
 HTTPS support.  If this appears to be the problem for real, you can work
 around this for now by downloading the file manually and placing it in
-  "${EPREFIX}"/usr/portage/distfiles
+  "${DISTDIR}"
 I will find it when you run me again.  If this is NOT the problem, then
 EOF
 		fi
@@ -2784,7 +2785,7 @@ EOF
 It seems one of your logs indicates a download problem due to missing
 HTTPS support.  If this appears to be the problem for real, you can work
 around this for now by downloading the file manually and placing it in
-  "${EPREFIX}"/usr/portage/distfiles
+  "${DISTDIR}"
 I will find it when you run me again.  If this is NOT the problem, then
 EOF
 		fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d1fb64f7b107149d893966feac6d52fe1e95795f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 18:55:14 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 18:55:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d1fb64f7

scripts/bootstrap-prefix: add patch for make with newer glibc

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3b4e648d0a..b737a16622 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -806,6 +806,23 @@ bootstrap_gnu() {
 	fi
 
 	local myconf=""
+	if [[ ${PN} == "make" && ${PV} == "4.2.1" ]] ; then
+		# mimick http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
+		local oldl="# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION"
+		local newl="# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2"
+		mv configure.ac{,.orig}
+		mv configure{,.orig}
+		sed -e '/^#define GLOB_INTERFACE_VERSION 1/d' \
+			-e "s/^${oldl}/${newl}/" \
+			configure.ac.orig > configure.ac
+		sed -e '/^#define GLOB_INTERFACE_VERSION 1/d' \
+			-e "s/^${oldl}/${newl}/" \
+			configure.orig > configure
+		chmod 755 configure
+		touch -r configure.ac{.orig,}
+		touch -r configure{.orig,}
+	fi
+
 	if [[ ${PN} == "grep" ]] ; then
 		# Solaris and OSX don't like it when --disable-nls is set,
 		# so just don't set it at all.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     65bb9581646328cca88db9cc9e32ca5902886547
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 09:16:22 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 09:16:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=65bb9581

scripts/bootstrap-prefix: fix compilation of m4 on newer glibc/gcc

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b737a16622..7a7d78ad0f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -823,6 +823,12 @@ bootstrap_gnu() {
 		touch -r configure{.orig,}
 	fi
 
+	if [[ ${PN} == "m4" ]] ; then
+		# drop _GL_WARN_ON_USE which gets turned into an error with
+		# recent GCC
+		sed -i -e '/_GL_WARN_ON_USE (gets/d' lib/stdio.in.h lib/stdio.h
+	fi
+
 	if [[ ${PN} == "grep" ]] ; then
 		# Solaris and OSX don't like it when --disable-nls is set,
 		# so just don't set it at all.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fc1019027bbed36b434ed818b4a3dc848a3679b6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 09:52:12 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 09:52:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fc101902

scripts/bootstrap-prefix: fix make bootstrap

Due to wrongly patched make, it would segfault when globs are used (as
for m4-1.4.18 and sed-4.7).  This crash was previously ignored by
bootstrapping m4-1.4.17, but resurfaced in stage2 when sed-4.7 is
installed.

Just define __alloca and __stat for GNU/Linux hosts, because that should
work everywhere.  We technically don't need the m4 fix any more because
we can use (fixed) 1.4.18, but keep it around as it doesn't hurt much.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7a7d78ad0f..f8ce6c86c5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -807,25 +807,16 @@ bootstrap_gnu() {
 
 	local myconf=""
 	if [[ ${PN} == "make" && ${PV} == "4.2.1" ]] ; then
-		# mimick http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
-		local oldl="# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION"
-		local newl="# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2"
-		mv configure.ac{,.orig}
-		mv configure{,.orig}
-		sed -e '/^#define GLOB_INTERFACE_VERSION 1/d' \
-			-e "s/^${oldl}/${newl}/" \
-			configure.ac.orig > configure.ac
-		sed -e '/^#define GLOB_INTERFACE_VERSION 1/d' \
-			-e "s/^${oldl}/${newl}/" \
-			configure.orig > configure
-		chmod 755 configure
-		touch -r configure.ac{.orig,}
-		touch -r configure{.orig,}
+		if [[ ${CHOST} == *-linux-gnu* ]] ; then
+			# force this, macros aren't set correctly with newer glibc
+			export CPPFLAGS="${CPPFLAGS} -D__alloca=alloca -D__stat=stat"
+		fi
 	fi
 
 	if [[ ${PN} == "m4" ]] ; then
 		# drop _GL_WARN_ON_USE which gets turned into an error with
-		# recent GCC
+		# recent GCC 1.4.17 and below only, on 1.4.18 this expression
+		# doesn't match
 		sed -i -e '/_GL_WARN_ON_USE (gets/d' lib/stdio.in.h lib/stdio.h
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e55d105d94506b77de1814f52346b0a4d126f129
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  2 11:10:22 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul  2 11:11:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e55d105d

scripts/bootstrap-prefix: bump bootstrap portage

This is necessary for ppc-macos.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f8ce6c86c5..25786ed6d4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -666,8 +666,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.67"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.67"
+	STABLE_PV="2.3.68"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.68"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     1a2c5387f43e3364b186a8e3dc0e5f890c2475f9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 18:16:19 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 18:16:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1a2c5387

scripts/bootstrap-prefix: bump tree snapshot for ppc-macos

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 25786ed6d4..c6c0e1079d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -581,7 +581,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20190602"
+	local PV="20190711"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     082de40aabef777138fd9a5dd0f7990bc5d68db2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 09:00:10 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 09:00:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=082de40a

scripts/bootstrap-prefix: add python2_7 for clang-based targets

clang-6 (at least) needs python2, so re-add python2_7 to PYTHON_TARGETS
if this package is going to be installed in stage2.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c6c0e1079d..888b620148 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -390,6 +390,13 @@ bootstrap_setup() {
 				echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
 			[[ ${OFFLINE_MODE} ]] && \
 				echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
+			if [[ ${compiler_type} == clang ]] ; then
+				local ptrgs=$(sed -n 's/^PYTHON_TARGETS="\([^"]\+\)".*$/\1/' \
+					"${PORTDIR}"/profiles/prefix/make.conf)
+				ptrgs=${ptrgs/-python2_7/}
+				echo "# python2 is required by sys-devel/clang-6"
+				echo "PYTHON_TARGETS=\"python2_7 ${ptrgs}\""
+			fi
 		} > "${ROOT}"/etc/portage/make.conf
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     98bc7e59e6ef7e9b84d39e7eb447628967e3931c
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 11:16:11 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 11:17:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=98bc7e59

bootstrap-prefix.sh: fix cleaning the resume list

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 888b620148..f1f670da9d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2047,7 +2047,7 @@ bootstrap_stage3() {
 
 	# "wipe" mtimedb such that the resume list is proper after this stage
 	# (--depclean may fail, which is ok)
-	sed -i -e 's/resume_backup/cleared/' "${EPREFIX}"/var/cache/edb/mtimedb
+	sed -i -e 's/resume/cleared/' "${ROOT}"/var/cache/edb/mtimedb
 
 	einfo "stage3 successfully finished"
 }
@@ -2822,7 +2822,7 @@ EOF
 
 	local cmd="emerge -e system"
 	if [[ -e ${EPREFIX}/var/cache/edb/mtimedb ]] && \
-		grep -q resume_backup "${EPREFIX}"/var/cache/edb/mtimedb ;
+		grep -q resume "${EPREFIX}"/var/cache/edb/mtimedb ;
 	then
 		cmd="emerge --resume"
 	fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     91734750c199af8e90db3d62e20e45b94d20357c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 15:29:08 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 15:33:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=91734750

scripts/bootstrap-prefix: use 10.14 profile for 10.15 and up

We don't have sources available for 10.15 (yet), so let's build a
10.14-based toolchain instead

Bug: https://bugs.gentoo.org/701720
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f1f670da9d..ce33fd945a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -432,6 +432,11 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
+		x86_64-apple-darwin19)
+			# handle newer releases on the last profile we have headers
+			# and stuff for (https://opensource.apple.com/)
+			profile="prefix/darwin/macos/10.14/x64"
+			;;
 		x86_64-apple-darwin9|x86_64-apple-darwin1[012345678])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8444915911fb0b2e80dc82ffaf670694262a579e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 10 13:28:31 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 13:28:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=84449159

scripts/bootstrap-prefix: bootstrap Python-3.6.10

3.6.8 is no longer available on the mirrors, thanks edwinvanl

Closes: https://bugs.gentoo.org/705104
Closes: https://bugs.gentoo.org/705108
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ce33fd945a..b0d2a09ec8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -939,7 +939,7 @@ bootstrap_gnu() {
 
 PYTHONMAJMIN=3.6   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-	PV=3.6.8
+	PV=3.6.10
 	A=Python-${PV}.tar.xz
 	patch=true
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     87e07a00dc1f94a8798f56003192daf81be7d717
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 02:43:05 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 02:53:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=87e07a00

s/bootstrap-prefix.sh: turn off app-portage/portage-utils[qmanifest].

  In early stage 3, this is to break to following dependency circle:
  - app-crypt/gnupg
  - dev-libs/libgpg-error
  - sys-devel/gettext (autopoint)
  - dev-lang/perl
  - app-admin/perl-cleaner
  - app-portage/portage-utils

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2abc3905d4..4dc2422e2a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1551,6 +1551,7 @@ do_emerge_pkgs() {
 			-pcre
 			-ssl
 			-python
+			-qmanifest
 			bootstrap
 			clang
 			internal-glib

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     e8e0f7f4c06a8ddbe113ebe6413c6d5f1925c84d
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 02:41:04 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 02:53:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e8e0f7f4

s/bootstrap-prefix.sh: Disable stage2 gcc /usr/local/include lookup.

  stage2 gcc searching inside /usr/local/include induces errors with
  exotic headers.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3bb523071c..2abc3905d4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1717,7 +1717,7 @@ bootstrap_stage2() {
 	for pkg in ${compiler_stage1} ; do
 		# <glibc-2.5 does not understand .gnu.hash, use
 		# --hash-style=both to produce also sysv hash.
-		EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both)" \
+		EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both) --with-local-prefix=${ROOT}" \
 		MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 		GCC_MAKE_TARGET=all \
 		TPREFIX="${ROOT}" \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     af7eccdcb91377561e658cf0efe3221544d00286
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 13:30:25 2019 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 02:52:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=af7eccdc

s/bootstrap-prefix.sh: no encryption while completing @system.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b0e69b37c9..0669107fb5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2035,8 +2035,8 @@ bootstrap_stage3() {
 		emerge --sync || emerge-webrsync || return 1
 	fi
 
-	# avoid installing git just for fun while completing @system
-	export USE="-git"
+	# avoid installing git or encryption just for fun while completing @system
+	export USE="-git -crypt"
 
 	# Portage should figure out itself what it needs to do, if anything.
 	# Avoid glib compiling for Cocoa libs if it finds them, since we're

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     299f064040213f1ebcf936d3f710c9967d7fb243
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 13:25:09 2019 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 02:52:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=299f0640

scripts/bootstrap-prefix.sh: Change headers to Gentoo standard.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b0d2a09ec8..b0e69b37c9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2006-2018 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 2006-2019 Gentoo Authors; Distributed under the GPL v2
 
 trap 'exit 1' TERM KILL INT QUIT ABRT
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     02451cdd8614f1072096608c49ae7796a6363819
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 02:38:20 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 02:53:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=02451cdd

s/bootstrap-prefix.sh: fake rsync to install linux-headers.

  linux-headers starts to use rsync to do the installation.  Replace
  it with a shell script to call cp instead.

Closes: https://bugs.gentoo.org/699718
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0669107fb5..3bb523071c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1858,6 +1858,24 @@ bootstrap_stage3() {
 				> "${ROOT}"/usr/bin/perl
 			chmod +x "${ROOT}"/usr/bin/perl
 		fi
+
+		# Need rsync to for linux-headers installation
+		if [[ ! -x "${ROOT}"/usr/bin/rsync ]]; then
+			cat > "${ROOT}"/usr/bin/rsync <<-EOF
+		#!${ROOT}/bin/bash
+		while (( \$# > 0 )); do
+		case \$1 in
+		-*) shift; continue ;;
+		*) break ;;
+		esac
+		done
+		dst="\$2"/\$(basename \$1)
+		mkdir -p "\${dst}"
+		cp -rv \$1/* "\${dst}"/
+		EOF
+			chmod +x "${ROOT}"/usr/bin/rsync
+		fi
+
 		# Tell dynamic loader the path of libgcc_s.so of stage2
 		if [[ ! -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf ]]; then
 			mkdir -p "${ROOT}"/etc/ld.so.conf.d
@@ -1877,6 +1895,8 @@ bootstrap_stage3() {
 		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 		grep -q 'apiversion=9999' "${ROOT}"/usr/bin/perl && \
 			rm "${ROOT}"/usr/bin/perl
+		grep -q 'esac' "${ROOT}"/usr/bin/rsync && \
+			rm "${ROOT}"/usr/bin/rsync
 
 		pkgs=(
 			sys-devel/binutils-config

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     84c9acaf4bab2b815d5113013285fd550c6f0cd8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 09:32:33 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 09:32:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=84c9acaf

scripts/bootstrap-prefix: reduce portage-utils deps during bootstrap

drop both qmanifest as well as qtegrity to get minimal (= no) deps

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4dc2422e2a..2c26201141 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1551,7 +1551,7 @@ do_emerge_pkgs() {
 			-pcre
 			-ssl
 			-python
-			-qmanifest
+			-qmanifest -qtegrity
 			bootstrap
 			clang
 			internal-glib

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     5d5525ff57e9f0e28a17ea63aac19739cb5e77de
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 15:43:29 2020 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 15:51:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5d5525ff

bootstrap-prefix.sh: fix circular deps in stage3

In prefix guest, when about to "with_stack_emerge_pkgs sys-apps/grep",
portage fails with circular dependencies potentially breakable with
USE=-berkdb, although we do set the USE=-berkdb environment variable.
The problem here is that USE=-berkdb does apply to the stacked prefix
only, not the base prefix, so we need to persist the base prefix' USE
flags when we are about to do "with_stack_emerge_pkgs", even if this is
not a problem with RAP right now, maybe because of a different tree.

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2c26201141..7bb3e9df35 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1556,6 +1556,17 @@ do_emerge_pkgs() {
 			clang
 			internal-glib
 		)
+		if [[ " ${USE} " == *" prefix-stack "* ]] &&
+		   [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] &&
+		   ! grep -q '^USE=".*" # by bootstrap-prefix.sh$' "${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf"
+		then
+			# With prefix-stack, the USE env var does apply to the stacked
+			# prefix only, not the base prefix (any more? since some portage
+			# version?), so we have to persist the base USE flags into the
+			# base prefix - without the additional incoming USE flags.
+			echo "USE=\"\${USE} ${myuse[*]}\" # by bootstrap-prefix.sh" \
+				>> "${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf"
+		fi
 		myuse=" ${myuse[*]} "
 		local use
 		for use in ${USE} ; do

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     29ee6c868a673492b3e3c1b5e7047ab509fe4f27
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 11:46:30 2020 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 11:47:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=29ee6c86

bootstrap-prefix.sh: bump stage1 findutils

Bug: https://bugs.gentoo.org/663242
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7bb3e9df35..a3aaeaa3aa 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1207,7 +1207,9 @@ bootstrap_sed() {
 }
 
 bootstrap_findutils() {
-	bootstrap_gnu findutils 4.5.10 || bootstrap_gnu findutils 4.2.33
+	bootstrap_gnu findutils 4.7.0 ||
+	bootstrap_gnu findutils 4.5.10 ||
+	bootstrap_gnu findutils 4.2.33
 }
 
 bootstrap_wget() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     276aab8ce748c1e4867e0666cfba12714dc4495d
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 16:35:34 2020 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 16:36:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=276aab8c

bootstrap-prefix.sh: use single distdir

While using prefix-stack during bootstrap, base prefix does not listen
to DISTDIR from environment, but etc/portage/make.conf only.
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a3aaeaa3aa..010580f3ef 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -375,6 +375,7 @@ bootstrap_setup() {
 			echo 'CXXFLAGS="${CFLAGS}"'
 			echo "MAKEOPTS=\"${MAKEOPTS}\""
 			echo "CONFIG_SHELL=\"${ROOT}/bin/bash\""
+			echo "DISTDIR=\"${DISTDIR:-${ROOT}/var/cache/distfiles}\""
 			if is-rap ; then
 				echo "# sandbox does not work well on Prefix, bug 490246"
 				echo 'FEATURES="${FEATURES} -usersandbox -sandbox"'

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Michael Haubenwallner]

commit:     ec023785f6f32eac7e0e7364552d418f899e4ad5
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 16:37:25 2020 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 16:37:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ec023785

bootstrap-prefix.sh: break pam<->libcap circle

Closes: https://bugs.gentoo.org/712020
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 010580f3ef..5eca478c5a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1923,6 +1923,15 @@ bootstrap_stage3() {
 		export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
 		BOOTSTRAP_RAP=yes \
 		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+
+		# avoid circular deps with sys-libs/pam, bug#712020
+		pkgs=(
+				sys-apps/attr
+				sys-libs/libcap
+		)
+		BOOTSTRAP_RAP=yes \
+		USE="${USE} -pam" \
+		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	else
 		pkgs=(
 			sys-apps/gentoo-functions

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     39f5044b32d30c5296fc103cd573737c084e3787
Author:     Chris Slycord <cslycord <AT> gmail <DOT> com>
AuthorDate: Mon Mar 30 17:10:56 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 17:10:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=39f5044b

scripts/bootstrap-bash: fix bashisms, bug #714634

Closes: https://bugs.gentoo.org/714634
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-bash.sh | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/scripts/bootstrap-bash.sh b/scripts/bootstrap-bash.sh
index a3d78afea0..b24015fc19 100755
--- a/scripts/bootstrap-bash.sh
+++ b/scripts/bootstrap-bash.sh
@@ -10,7 +10,7 @@
 
 if [ -z "$1" ] ; then
 	echo "usage: ${0} <location>" > /dev/stderr
-	exit -1
+	exit 255
 fi
 
 mkdir -p "$1"
@@ -20,6 +20,22 @@ cd bash-build
 
 GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org/distfiles"}
 
+command_exists() {
+	check_cmd="$1"
+	command -v $check_cmd >/dev/null 2>&1
+}
+
+same_file() {
+	file1="$1"
+	file2="$2"
+
+	if [ "$(stat -c '%i%d' "$file1" "$file2" | sort -u | wc -l)" -eq 1 ]; then
+		return 0
+	else
+		return 1
+	fi
+}
+
 if [ ! -e bash-4.2.tar.gz ] ; then
 	eerror() { echo "!!! $*" 1>&2; }
 	einfo() { echo "* $*"; }
@@ -27,18 +43,29 @@ if [ ! -e bash-4.2.tar.gz ] ; then
 	if [ -z ${FETCH_COMMAND} ] ; then
 		# Try to find a download manager, we only deal with wget,
 		# curl, FreeBSD's fetch and ftp.
-		if [ x$(type -t wget) == "xfile" ] ; then
+		if command_exists wget; then
 			FETCH_COMMAND="wget"
-			[ $(wget -h) == *"--no-check-certificate"* ] && FETCH_COMMAND+=" --no-check-certificate"
-		elif [ x$(type -t curl) == "xfile" ] ; then
+			case "$(wget -h 2>&1)" in
+				*"--no-check-certificate"*)
+					FETCH_COMMAND="$FETCH_COMMAND --no-check-certificate"
+					;;
+			esac
+		elif command_exists curl; then
 			einfo "WARNING: curl doesn't fail when downloading fails, please check its output carefully!"
 			FETCH_COMMAND="curl -f -L -O"
-		elif [ x$(type -t fetch) == "xfile" ] ; then
+		elif command_exists fetch; then
 			FETCH_COMMAND="fetch"
-		elif [ x$(type -t ftp) == "xfile" ] &&
-			 [ ${CHOST} != *-cygwin* || ! $(type -P ftp) -ef $(cygpath -S)/ftp ] ; then
+		elif command_exists ftp; then
 			FETCH_COMMAND="ftp"
-		else
+			case "${CHOST}" in
+				*-cygwin*)
+					if same_file "$(command -v ftp)" "$(cygpath -S)/ftp"; then
+						FETCH_COMMAND=''
+					fi
+					;;
+			esac
+		fi
+		if [ -z ${FETCH_COMMAND} ]; then
 			eerror "no suitable download manager found (need wget, curl, fetch or ftp)"
 			eerror "could not download ${1##*/}"
 			eerror "download the file manually, and put it in ${PWD}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     095f4b4daf6029369c5d5ed308607c8b1e45276d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 17:08:26 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 17:08:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=095f4b4d

scripts/bootstrap-prefix: check ownership of $EPREFIX dir, bug #715312

Closes: https://bugs.gentoo.org/715312
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5eca478c5a..25e091c37a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2714,10 +2714,20 @@ EOF
 			EPREFIX=
 			continue
 		fi
+		if [[ $(stat -c '%U/%G' "${EPREFIX}"/.canihaswrite) != \
+			$(stat -c '%U/%G' "${EPREFIX}") ]] ;
+		then
+			echo
+			echo "The $EPREFIX directory has different ownership than expected."
+			echo "Ensure the directory is owned (user and group) by your"
+			echo "primary ids"
+			EPREFIX=
+			continue
+		fi
 		# don't really expect this one to fail
 		rm -f "${EPREFIX}"/.canihaswrite || exit 1
 		# location seems ok
-		break;
+		break
 	done
 	export STAGE1_PATH=${PATH}
 	export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$EPREFIX/tmp/usr/local/bin:${PATH}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     b8998ebd8595fcae2a13ea8050bdb758726e1275
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 07:53:37 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon May 11 06:58:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b8998ebd

bootstrap-prefix.sh: gawk depends on texinfo.

gawk has to be merged with --nodeps.

Closes: https://bugs.gentoo.org/717786
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 25e091c37a..3e36df7396 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1999,6 +1999,9 @@ bootstrap_stage3() {
 
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 
+	# need special care, it depends on texinfo, #717786
+	emerge_pkgs --nodeps sys-apps/gawk || return 1
+
 	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python${PYTHONMAJMIN} )
 	# Use $ROOT tools where possible from now on.
 	if [[ $(readlink "${ROOT}"/bin/sh) == "${ROOT}/tmp/"* ]] ; then
@@ -2021,7 +2024,6 @@ bootstrap_stage3() {
 		app-arch/gzip
 		app-arch/tar
 		sys-apps/grep
-		sys-apps/gawk
 		sys-devel/make
 		sys-apps/file
 		app-admin/eselect

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     772a54809044917084b4dfb38890cf77c7814fb8
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 08:07:02 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon May 11 06:58:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=772a5480

bootstrap-prefix.sh: disable stage3 gcc bootstrap for RAP

stage2 glibc is incompatible with that of stage3. gcc bootstrap does
not handle this situation correctly.

During bootstrap src_compile(), it passes libstdc++ of new glibc by
LD_LIBRARY_PATH to work with g++ of stage2, resulting in symbol
conflicts at lease on CentOS 7.

The call of `emerge -e @system` will finally build a gcc in bootstrap
mode.

Reported-by: huiyiqun, jsteward
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3e36df7396..ab57d62419 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1981,7 +1981,8 @@ bootstrap_stage3() {
 	fi
 
 	# try to get ourself out of the mudd, bug #575324
-	EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \
+	EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto --disable-bootstrap')" \
+	GCC_MAKE_TARGET=$(rapx all) \
 	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 	PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \
 	with_stack_emerge_pkgs --nodeps ${compiler} || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     398e92248b862f554d2813b52e0270fdafa33577
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 06:54:44 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon May 11 06:58:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=398e9224

bootstrap-prefix.sh: bump to Python 3.7.

Reported-By: Akase
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 71a1eb525c..b335ad2d90 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -938,9 +938,9 @@ bootstrap_gnu() {
 	einfo "${PN}-${PV} successfully bootstrapped"
 }
 
-PYTHONMAJMIN=3.6   # keep this number in line with PV below for stage1,2
+PYTHONMAJMIN=3.7   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-	PV=3.6.10
+	PV=3.7.7
 	A=Python-${PV}.tar.xz
 	patch=true
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     d63f1a5f76e1fdbba9e8a3a572575492e239954e
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 06:49:17 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon May 11 06:58:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d63f1a5f

bootstrap-prefix.sh: do not use stacked-prefix in stage3.

stage2 is not a complete Prefix. Furthermore, in standalone bootstrap,
Stage 2 and 3 use different glibc and cannot be stacked.

Closes: https://bugs.gentoo.org/717786
Bug: https://bugs.gentoo.org/676096
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ab57d62419..71a1eb525c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1857,6 +1857,9 @@ bootstrap_stage3() {
 		emerge_pkgs "$@"
 	}
 
+	# pre_emerge_pkgs relies on stage 2 portage.
+	pre_emerge_pkgs() { is-rap && without_stack_emerge_pkgs "$@" || with_stack_emerge_pkgs "$@"; }
+
 	# Some packages fail to properly depend on sys-apps/texinfo.
 	# We don't really need that package, so we fake it instead,
 	# explicitly emerging it later on will overwrite the fakes.
@@ -1865,6 +1868,15 @@ bootstrap_stage3() {
 		cp -p "${ROOT}"/tmp/usr/bin/{makeinfo,install-info} "${ROOT}"/usr/bin
 	fi
 
+	# Bug 655414, 676096.
+	# Portage does search it's global config using PORTAGE_OVERRIDE_EPREFIX,
+	# so we need to provide it there - emerging portage itself is expected
+	# to finally overwrite it.
+	if [[ ! -d "${ROOT}"/usr/share/portage ]]; then
+		mkdir -p "${ROOT}"/usr/share
+		cp -a "${ROOT}"{/tmp,}/usr/share/portage
+	fi
+
 	if is-rap ; then
 		# We need ${ROOT}/usr/bin/perl to merge glibc.
 		if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then
@@ -1907,7 +1919,7 @@ bootstrap_stage3() {
 		)
 
 		BOOTSTRAP_RAP=yes \
-		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+		pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 		grep -q 'apiversion=9999' "${ROOT}"/usr/bin/perl && \
 			rm "${ROOT}"/usr/bin/perl
 		grep -q 'esac' "${ROOT}"/usr/bin/rsync && \
@@ -1922,7 +1934,7 @@ bootstrap_stage3() {
 		RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
 		export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
 		BOOTSTRAP_RAP=yes \
-		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+		pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
 		# avoid circular deps with sys-libs/pam, bug#712020
 		pkgs=(
@@ -1931,7 +1943,7 @@ bootstrap_stage3() {
 		)
 		BOOTSTRAP_RAP=yes \
 		USE="${USE} -pam" \
-		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+		pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	else
 		pkgs=(
 			sys-apps/gentoo-functions
@@ -1946,7 +1958,7 @@ bootstrap_stage3() {
 			${linker}
 		)
 
-		with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
+		pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	fi
 	# remove stage2 ld so that stage3 ld is used by stage2 gcc.
 	is-rap && [[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && \
@@ -1985,7 +1997,7 @@ bootstrap_stage3() {
 	GCC_MAKE_TARGET=$(rapx all) \
 	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 	PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \
-	with_stack_emerge_pkgs --nodeps ${compiler} || return 1
+	pre_emerge_pkgs --nodeps ${compiler} || return 1
 	# undo libgcc_s.so path of stage2
 
 	# now we have the compiler right there
@@ -2001,7 +2013,7 @@ bootstrap_stage3() {
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 
 	# need special care, it depends on texinfo, #717786
-	emerge_pkgs --nodeps sys-apps/gawk || return 1
+	pre_emerge_pkgs --nodeps sys-apps/gawk || return 1
 
 	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python${PYTHONMAJMIN} )
 	# Use $ROOT tools where possible from now on.
@@ -2013,7 +2025,7 @@ bootstrap_stage3() {
 	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
 	# get a sane bash, overwriting tmp symlinks
-	with_stack_emerge_pkgs "" "app-shells/bash" || return 1
+	pre_emerge_pkgs "" "app-shells/bash" || return 1
 
 	# now we have a shell right there
 	unset CONFIG_SHELL
@@ -2035,7 +2047,7 @@ bootstrap_stage3() {
 	# OSX, confusing the buildsystem
 	ac_cv_c_decl_report=warning \
 	TIME_T_32_BIT_OK=yes \
-	with_stack_emerge_pkgs "" "${pkgs[@]}" || return 1
+	pre_emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
 		echo "We need openrc-run at ${ROOT}/sbin to merge rsync." \
@@ -2051,18 +2063,6 @@ bootstrap_stage3() {
 		sys-apps/portage
 	)
 
-	# Bug 655414, 676096.
-	# Enough packages emerged with USE=prefix-stack with tmp/ as base prefix
-	# to allow for sys-apps/portage itself and dependencies without any
-	# dependency into tmp/ now.
-	# Portage does search it's global config using PORTAGE_OVERRIDE_EPREFIX,
-	# so we need to provide it there - emerging portage itself is expected
-	# to finally overwrite it.
-	if [[ ! -d "${ROOT}"/usr/share/portage ]]; then
-		mkdir -p "${ROOT}"/usr/share
-		cp -a "${ROOT}"{/tmp,}/usr/share/portage
-	fi
-
 	USE="ssl" \
 	without_stack_emerge_pkgs "" "${pkgs[@]}" || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     487ddf6654a5d25ef22f1d0a98e78d6acf0878ac
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 14:41:15 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue May 12 14:41:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=487ddf66

bootstrap-prefix.sh: bootstrap m4 on glibc-2.28 and newer.

Take the patch from Gentoo tree for Stage 1, to cope with hosts having
glibc-2.28 and newer.

Closes: https://bugs.gentoo.org/715880
Reported-By: Xuewei Liu <18800136075 <AT> 163.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b335ad2d90..19ad9c003a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -831,6 +831,10 @@ bootstrap_gnu() {
 		# recent GCC 1.4.17 and below only, on 1.4.18 this expression
 		# doesn't match
 		sed -i -e '/_GL_WARN_ON_USE (gets/d' lib/stdio.in.h lib/stdio.h
+
+		# Bug 715880
+		efetch http://dev.gentoo.org/~heroxbd/m4-1.4.18-glibc228.patch || return 1
+		patch -p1 < "${DISTDIR}"/m4-1.4.18-glibc228.patch || return 1
 	fi
 
 	if [[ ${PN} == "grep" ]] ; then
@@ -1390,6 +1394,8 @@ bootstrap_stage1() {
 	[[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1
 	type -P xz > /dev/null || (bootstrap_xz) || return 1
 	type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1
+	[[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \
+		|| (bootstrap_patch) || return 1
 	[[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1
 	[[ -x ${ROOT}/tmp/usr/bin/bison ]] \
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
@@ -1399,8 +1405,6 @@ bootstrap_stage1() {
 		|| (bootstrap_coreutils) || return 1
 	[[ $(find --version 2>&1) == *GNU* ]] || (bootstrap_findutils) || return 1
 	[[ $(tar --version 2>&1) == *GNU* ]] || (bootstrap_tar) || return 1
-	[[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \
-		|| (bootstrap_patch) || return 1
 	[[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1
 	[[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] \
 		|| bootstrap_gawk || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     f7c34a69be5e011fdf10f159c36b91a2c08d3444
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 07:24:30 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed May 13 07:24:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f7c34a69

bootstrap-prefix.sh: remove the startprefix fallback.

app-portage/prefix-toolkit is in tree.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 19ad9c003a..c50aaa9fd9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -628,27 +628,8 @@ bootstrap_startscript() {
 		eerror "automate starting your prefix, set SHELL and rerun this script" > /dev/stderr
 		return 1
 	fi
-	if [[ -d ${PORTDIR}/app-portage/prefix-toolkit ]] ; then
-		einfo "Finally, emerging prefix-toolkit for your convenience"
-		emerge -u app-portage/prefix-toolkit || return 1
-	else
-		einfo "Creating the Prefix start script (startprefix)"
-		# currently I think right into the prefix is the best location, as
-		# putting it in /bin or /usr/bin just hides it some more for the
-		# user
-		if is-rap ; then
-			mkdir -p "${PORTDIR}"/scripts
-			wget $([[ $(wget -h) == *"--no-check-certificate"* ]] && echo --no-check-certificate) \
-				 https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/startprefix.in \
-				 -O "${PORTDIR}"/scripts/startprefix.in
-		fi
-
-		sed \
-			-e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \
-			"${PORTDIR}"/scripts/startprefix.in \
-			> "${ROOT}"/startprefix
-		chmod 755 "${ROOT}"/startprefix
-	fi
+	einfo "Finally, emerging prefix-toolkit for your convenience"
+	emerge -u app-portage/prefix-toolkit || return 1
 	einfo "To start Gentoo Prefix, run the script ${ROOT}/startprefix"
 
 	# see if PATH is kept/respected

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     91cc96f4ef5489dcf33724b5c3c615b59b7f5047
Author:     Alexei Colin <acolin <AT> isi <DOT> edu>
AuthorDate: Thu May 28 18:23:49 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May 29 06:22:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=91cc96f4

bootstrap-prefix.sh: exclude pip from Python build #715974

Pip is not needed but it fails to build due to lack of pyexpat,
which generates a non-fatal error during boostrap of stage1:

    ModuleNotFoundError: No module named 'pyexpat'
    make: *** [Makefile:1102: install] Error 1
    ??? Python failed to install *sigh* continuing anyway
    * Python bootstrapped

Closes: https://bugs.gentoo.org/715974
Signed-off-by: Alexei Colin <acolin <AT> isi.edu>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c50aaa9fd9..42f66eb9bb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1076,6 +1076,7 @@ bootstrap_python() {
 	PKG_CONFIG= \
 	econf \
 		--with-system-ffi \
+		--without-ensurepip \
 		--disable-ipv6 \
 		--disable-shared \
 		--libdir="${ROOT}"/tmp/usr/lib \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fda55219e37e3fb4dcb7768802330907cc1af405
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 09:49:13 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 09:55:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fda55219

scripts/bootstrap-prefix: rework efetch(ing) logic somewhat

1) distfiles are in transitioning to hash-based subdir layout
2) distfiles cannot be manually appended to any more

To fix 1) use redirection service from distfiles.prefix.b.n to simply
calculate the hash, so our existing calls will keep working.
To fix 2) use same redirection service, but on /prefix url, that points
to a local distfiles mirror for missing files, hopefully providing
what's missing

The order in efetch tries things now is a bit odd and long, but avoids
using the redirection service:
1) try GENTOO_MIRRORS provided hosts, or http://distfiles.g.o when unset
2) try http://distfiles.prefix.b.n to redirect to distfiles (for when
   the hash approach becomes mandatory)
3) try http://distfiles.prefix.b.n/prefix to redirect to prefix-local
   distfiles (using the same hash approach)
4) try the original source location

Bug: https://bugs.gentoo.org/726462
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 42f66eb9bb..4ca56caef4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -70,7 +70,7 @@ efetch() {
 		# try for mirrors first, fall back to distfiles, then try given location
 		local locs=( )
 		local loc
-		for loc in ${GENTOO_MIRRORS} ; do
+		for loc in ${GENTOO_MIRRORS} ${DISTFILES_G_O} ${DISTFILES_PFX}; do
 			locs=(
 				"${locs[@]}"
 				"${loc}/distfiles/${1##*/}"
@@ -579,7 +579,8 @@ do_tree() {
 		# respect the source to get the latest
 		if [[ -n ${LATEST_TREE_YES} ]] ; then
 			echo "$1"
-			( export GENTOO_MIRRORS= ; efetch "$1/$2" ) || return 1
+			( export GENTOO_MIRRORS= DISTFILES_G_O= DISTFILES_PFX= ;
+			  efetch "$1/$2" ) || return 1
 		else
 			efetch "$1/$2" || return 1
 		fi
@@ -2104,8 +2105,9 @@ set_helper_vars() {
 	PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/var/tmp}
 	DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
 	GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
-	DISTFILES_G_O="http://distfiles.gentoo.org"
-	GENTOO_MIRRORS=${GENTOO_MIRRORS:=${DISTFILES_G_O}}
+	DISTFILES_G_O="http://distfiles.prefix.gentoo.org"
+	DISTFILES_PFX="http://distfiles.prefix.gentoo.org/prefix"
+	GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
 	SNAPSHOT_HOST=$(rapx ${DISTFILES_G_O} http://rsync.prefix.bitzolder.nl)
 	SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
 	GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0cdde6481974d1d2e10025fc0183a1c9c1ed02fd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 11:25:34 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 11:25:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0cdde648

scripts/bootstrap-prefix: fix distfiles urls

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4ca56caef4..0f01cf54ca 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2105,8 +2105,8 @@ set_helper_vars() {
 	PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/var/tmp}
 	DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
 	GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
-	DISTFILES_G_O="http://distfiles.prefix.gentoo.org"
-	DISTFILES_PFX="http://distfiles.prefix.gentoo.org/prefix"
+	DISTFILES_G_O="http://distfiles.prefix.bitzolder.nl"
+	DISTFILES_PFX="http://distfiles.prefix.bitzolder.nl/prefix"
 	GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
 	SNAPSHOT_HOST=$(rapx ${DISTFILES_G_O} http://rsync.prefix.bitzolder.nl)
 	SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     425b26fa025d897f20a11e415748ff14cdd8f6a4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 11:55:40 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 11:55:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=425b26fa

scripts/bootstrap-prefix: update copyright

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0f01cf54ca..e70bc57311 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2006-2019 Gentoo Authors; Distributed under the GPL v2
+# Copyright 2006-2020 Gentoo Authors; Distributed under the GPL v2
 
 trap 'exit 1' TERM KILL INT QUIT ABRT
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     dedba266af11afd99be69dd29eb0bd1b4e9a3ad0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 07:12:17 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 07:12:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dedba266

scripts/bootstrap-prefix: try to avoid downloading files which don't exist

libressl only has a .gz tarball, so it's pointless to try .xz and bz2.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 97 +++++++++++++++++++--------------------------
 1 file changed, 40 insertions(+), 57 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e70bc57311..99b405f406 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -91,33 +91,6 @@ efetch() {
 	return 0
 }
 
-# template
-# bootstrap_() {
-# 	PV=
-# 	A=
-# 	einfo "Bootstrapping ${A%-*}"
-
-# 	efetch ${A} || return 1
-
-# 	einfo "Unpacking ${A%-*}"
-# 	export S="${PORTAGE_TMPDIR}/${PN}"
-# 	rm -rf ${S}
-# 	mkdir -p ${S}
-# 	cd ${S}
-# 	tar -zxf ${DISTDIR}/${A} || return 1
-# 	S=${S}/${PN}-${PV}
-# 	cd ${S}
-
-# 	einfo "Compiling ${A%-*}"
-# 	econf || return 1
-# 	$MAKE ${MAKEOPTS} || return 1
-
-# 	einfo "Installing ${A%-*}"
-# 	$MAKE install || return 1
-
-# 	einfo "${A%-*} successfully bootstrapped"
-# }
-
 configure_cflags() {
 	export CPPFLAGS="-I${ROOT}/tmp/usr/include"
 	
@@ -735,6 +708,40 @@ bootstrap_portage() {
 	einfo "${A%-*} successfully bootstrapped"
 }
 
+bootstrap_simple() {
+	local PN PV A S
+	PN=$1
+	PV=$2
+	A=${PN}-${PV}.tar.${3:-gz}
+	einfo "Bootstrapping ${A%-*}"
+
+	efetch ${4:-${DISTFILES_G_O}/distfiles}/${A} || return 1
+
+	einfo "Unpacking ${A%-*}"
+	S="${PORTAGE_TMPDIR}/${PN}-${PV}"
+	rm -rf "${S}"
+	mkdir -p "${S}"
+	cd "${S}"
+	case $3 in
+		xz)  decomp=xz    ;;
+		bz2) decomp=bzip2 ;;
+		gz|) decomp=gzip  ;;
+	esac
+	${decomp} -dc "${DISTDIR}"/${A} | tar -xf - || return 1
+	S="${S}"/${PN}-${PV}
+	cd "${S}"
+
+	einfo "Compiling ${A%-*}"
+	v $MAKE || return 1
+
+	einfo "Installing ${A%-*}"
+	v $MAKE PREFIX="${ROOT}"/tmp/usr install || return 1
+
+	cd "${ROOT}"
+	rm -Rf "${S}"
+	einfo "${PN}-${PV} successfully bootstrapped"
+}
+
 bootstrap_gnu() {
 	local PN PV A S
 	PN=$1
@@ -1279,42 +1286,18 @@ bootstrap_gzip() {
 }
 
 bootstrap_xz() {
-	GNU_URL=${XZ_URL:-http://tukaani.org} bootstrap_gnu xz 5.2.4 || \
-	GNU_URL=${XZ_URL:-http://tukaani.org} bootstrap_gnu xz 5.2.3
+	GNU_URL=http://tukaani.org/xz bootstrap_gnu xz 5.2.4 || \
+	GNU_URL=http://tukaani.org/xz bootstrap_gnu xz 5.2.3
 }
 
 bootstrap_bzip2() {
-	local PN PV A S
-	PN=bzip2
-	PV=1.0.6
-	A=${PN}-${PV}.tar.gz
-	einfo "Bootstrapping ${A%-*}"
-
-	efetch ${DISTFILES_G_O}/distfiles/${A} || return 1
-
-	einfo "Unpacking ${A%-*}"
-	S="${PORTAGE_TMPDIR}/${PN}-${PV}"
-	rm -rf "${S}"
-	mkdir -p "${S}"
-	cd "${S}"
-	gzip -dc "${DISTDIR}"/${A} | tar -xf - || return 1
-	S="${S}"/${PN}-${PV}
-	cd "${S}"
-
-	einfo "Compiling ${A%-*}"
-	$MAKE || return 1
-
-	einfo "Installing ${A%-*}"
-	$MAKE PREFIX="${ROOT}"/tmp/usr install || return 1
-
-	cd "${ROOT}"
-	rm -Rf "${S}"
-	einfo "${A%-*} successfully bootstrapped"
+	bootstrap_simple bzip2 1.0.6 gz \
+		https://sourceware.org/pub/bzip2
 }
 
 bootstrap_libressl() {
-	GNU_URL="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL" \
-		bootstrap_gnu libressl 2.8.3
+	bootstrap_simple libressl 2.8.3 gz \
+		https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
 }
 
 bootstrap_stage_host_gentoo() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ad5ab57d7ce52784d597298c13265c617dbf507c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 14:33:18 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 14:33:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ad5ab57d

scripts/bootstrap-prefix: fix syntax error

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 99b405f406..33f699a817 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -723,9 +723,9 @@ bootstrap_simple() {
 	mkdir -p "${S}"
 	cd "${S}"
 	case $3 in
-		xz)  decomp=xz    ;;
-		bz2) decomp=bzip2 ;;
-		gz|) decomp=gzip  ;;
+		xz)    decomp=xz    ;;
+		bz2)   decomp=bzip2 ;;
+		gz|"") decomp=gzip  ;;
 	esac
 	${decomp} -dc "${DISTDIR}"/${A} | tar -xf - || return 1
 	S="${S}"/${PN}-${PV}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     af141f8e789704d2c8ec47ad6610c8c8198f2e70
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 14:39:15 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 14:40:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=af141f8e

scripts/bootstrap-prefix: run econf from bootstrap_simple too

and move the libressl specific code down here

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 33f699a817..f18832e648 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -709,7 +709,7 @@ bootstrap_portage() {
 }
 
 bootstrap_simple() {
-	local PN PV A S
+	local PN PV A S myconf
 	PN=$1
 	PV=$2
 	A=${PN}-${PV}.tar.${3:-gz}
@@ -731,7 +731,14 @@ bootstrap_simple() {
 	S="${S}"/${PN}-${PV}
 	cd "${S}"
 
+	# for libressl, only provide static lib, such that wget (above)
+	# links it in and we don't have to bother about RPATH or something
+	if [[ ${PN} == "libressl" ]] ; then
+		myconf="${myconf} --enable-static --disable-shared"
+	fi
+
 	einfo "Compiling ${A%-*}"
+	econf ${myconf} || return 1
 	v $MAKE || return 1
 
 	einfo "Installing ${A%-*}"
@@ -885,12 +892,6 @@ bootstrap_gnu() {
 		fi
 	fi
 
-	# for libressl, only provide static lib, such that wget (above)
-	# links it in and we don't have to bother about RPATH or something
-	if [[ ${PN} == "libressl" ]] ; then
-		myconf="${myconf} --enable-static --disable-shared"
-	fi
-
 	# SuSE 11.1 has GNU binutils-2.20, choking on crc32_x86
 	[[ ${PN} == "xz" ]] && myconf="${myconf} --disable-assembler"
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     893ea6fd78abba55dac4c84a7025ac4654a80181
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 06:19:24 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 06:19:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=893ea6fd

scripts/bootstrap-prefix: bump snapshot and portage versions

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f18832e648..84e31751be 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -568,7 +568,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20190711"
+	local PV="20200607"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -634,8 +634,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.68"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.68"
+	STABLE_PV="2.3.100"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.100"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f6bbc6f47013448193cbc328645c0cdfb679bfea
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 13:52:10 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 13:52:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6bbc6f4

scripts/bootstrap-prefix: allow stopping after stage{1,2,3}

export STOP_BOOTSTRAP_AFTER to stage1, stage2 or stage3 to make the
interactive bootstrap stop after finishing the mentioned stage.  This
will be useless for most, but handy for certain automated setups.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 84e31751be..c9391bf75c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2767,6 +2767,8 @@ EOF
 		exit 1
 	fi
 
+	[[ ${STOP_BOOTSTRAP_AFTER} == stage1 ]] && exit 0
+
 	unset ROOT
 
 	# stage1 has set a profile, which defines CHOST, so unset any CHOST
@@ -2816,6 +2818,8 @@ EOF
 		exit 1
 	fi
 
+	[[ ${STOP_BOOTSTRAP_AFTER} == stage2 ]] && exit 0
+
 	# new bash
 	hash -r
 
@@ -2854,6 +2858,8 @@ EOF
 		exit 1
 	fi
 
+	[[ ${STOP_BOOTSTRAP_AFTER} == stage3 ]] && exit 0
+
 	local cmd="emerge -e system"
 	if [[ -e ${EPREFIX}/var/cache/edb/mtimedb ]] && \
 		grep -q resume "${EPREFIX}"/var/cache/edb/mtimedb ;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     dd56c723b9354a3e9f0faec2dc8ae95552a87372
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 07:08:07 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 07:08:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dd56c723

scripts/bootstrap-prefix: only run configure if it exists

In bootstrap_simple, check if there is a configure script before trying
to call it.  Some packages don't have a configure script like bzip2.

Thanks Bob Dröge for pointing this out in bug #728682.

Bug: https://bugs.gentoo.org/728682
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c9391bf75c..d72d868a4e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -738,7 +738,9 @@ bootstrap_simple() {
 	fi
 
 	einfo "Compiling ${A%-*}"
-	econf ${myconf} || return 1
+	if [[ -x configure ]] ; then
+		econf ${myconf} || return 1
+	fi
 	v $MAKE || return 1
 
 	einfo "Installing ${A%-*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     e77fd01734f21ec2e9c985c28ba4eb30c1b2bc9d
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 23:34:25 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 23:52:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e77fd017

scripts/bootstrap-prefix.sh: do not skip USE=ssl in stage3.

USE=-ssl has been introduced in d830d32f64280bb 10 years ago to
simplify bootstrap logic, when cryptography was not crucial.

Now the assumptions do not hold anymore and USE=-ssl causes more
cursed situations than it cures.

This results in cleaner and more correct code.  As a by-product, it
fixes Bug 728986.

This has been tested on prefix-standalone, call for more tests.

Reported-By: Sammy Pfeiffer, devourer, anb
Closes: https://bugs.gentoo.org/728986

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d72d868a4e..3a9dd3cb87 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1525,7 +1525,6 @@ do_emerge_pkgs() {
 			-libcxx
 			-nls
 			-pcre
-			-ssl
 			-python
 			-qmanifest -qtegrity
 			bootstrap
@@ -2028,15 +2027,12 @@ bootstrap_stage3() {
 		chmod +x "${ROOT}"/sbin/openrc-run
 	fi
 
-	# gettext pulls in portage, which since 2.2.28 needs ssl enabled, so
-	# we need to lift our mask for that. (USE=ssl)
 	pkgs=(
 		virtual/os-headers
 		sys-devel/gettext
 		sys-apps/portage
 	)
 
-	USE="ssl" \
 	without_stack_emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	# Switch to the proper portage.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     6b522acbb352eaae250d54b48456350ded50d7ce
Author:     Alexander Bezrukov <phmagic <AT> mail <DOT> ru>
AuthorDate: Sun Oct 25 08:14:22 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 08:14:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6b522acb

scripts/bootstrap-prefix: fix stat invocation for Darwin/*BSD

Closes: https://bugs.gentoo.org/751037
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3a9dd3cb87..313139c0e8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2687,8 +2687,15 @@ EOF
 			EPREFIX=
 			continue
 		fi
-		if [[ $(stat -c '%U/%G' "${EPREFIX}"/.canihaswrite) != \
-			$(stat -c '%U/%G' "${EPREFIX}") ]] ;
+		# GNU and BSD variants of stat take different arguments (and
+		# format specifiers are not equivalent)
+		case "${CHOST}" in
+			*-darwin* | *-freebsd*) STAT='stat -f %u/%g' ;;
+			*)                      STAT='stat -c %U/%G' ;;
+		esac
+
+		if [[ $(${STAT} "${EPREFIX}"/.canihaswrite) != \
+			$(${STAT} "${EPREFIX}") ]] ;
 		then
 			echo
 			echo "The $EPREFIX directory has different ownership than expected."

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c87ecd828f4b4de9ba80c32d3eaf19bfcfc6deea
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 11:49:09 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 11:49:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c87ecd82

scripts/bootstrap-prefix.sh: add detection support for newer Apple clang

Thanks Alexander Bezrukov for an initial patch.  I went with a slightly
different approach, to be a bit more specific and hopefully not match
something unexpected in the future.

Closes: https://bugs.gentoo.org/751067
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 313139c0e8..559eb3a356 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -222,6 +222,23 @@ configure_toolchain() {
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
 			local mycc=
 			case "${ccvers}" in
+				*"Apple clang version "*)
+					vers=${ccvers#*Apple clang version }
+					vers=${vers% (clang-*}
+					# this is Clang, recent enough to compile recent clang
+					mycc=clang
+					compiler_stage1+="
+						${llvm_deps}
+						sys-devel/llvm
+						sys-devel/clang
+						sys-libs/libcxxabi
+						sys-libs/libcxx"
+					;;
+					esac
+					CC=clang
+					CXX=clang++
+					linker=sys-devel/binutils-apple
+					;;
 				*"Apple LLVM version "*)
 					vers=${ccvers#*Apple LLVM version }
 					vers=${vers% (clang-*}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     272dff6b38ab69bae0d0a1658aae2f55eeab28cf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 07:09:43 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 07:09:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=272dff6b

scripts/bootstrap-prefix: fix syntax error due to copy'n'paste

Thanks Alexander Bezrukov for the patch

Closes: https://bugs.gentoo.org/751406
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 559eb3a356..df71d5d392 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -233,8 +233,6 @@ configure_toolchain() {
 						sys-devel/clang
 						sys-libs/libcxxabi
 						sys-libs/libcxx"
-					;;
-					esac
 					CC=clang
 					CXX=clang++
 					linker=sys-devel/binutils-apple

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4af2e4cc26e0076bbec9eb48ff8f70519e297583
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 07:17:48 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 07:17:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4af2e4cc

scripts/bootstrap-prefix: don't pull in python2 for clang any more, bug #751412

Closes: https://bugs.gentoo.org/751412
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index df71d5d392..a3ada85d3b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -379,13 +379,6 @@ bootstrap_setup() {
 				echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
 			[[ ${OFFLINE_MODE} ]] && \
 				echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
-			if [[ ${compiler_type} == clang ]] ; then
-				local ptrgs=$(sed -n 's/^PYTHON_TARGETS="\([^"]\+\)".*$/\1/' \
-					"${PORTDIR}"/profiles/prefix/make.conf)
-				ptrgs=${ptrgs/-python2_7/}
-				echo "# python2 is required by sys-devel/clang-6"
-				echo "PYTHON_TARGETS=\"python2_7 ${ptrgs}\""
-			fi
 		} > "${ROOT}"/etc/portage/make.conf
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     6c17f821de91c518556ea345a1a88abbe8706bc3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 07:42:40 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 07:42:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6c17f821

scripts/bootstrap-prefix: pre-create portroot

For some reason linking the portage tree in the tmp image fails, so
ensure whilst setting up all other dirs in /tmp that also the portroot
is created.

Bug: https://bugs.gentoo.org/751421
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a3ada85d3b..46a5ec10c4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1349,6 +1349,8 @@ bootstrap_stage1() {
 	# best.
 
 	# See comments in do_tree().
+	local portroot=${PORTDIR%/*}
+	mkdir -p "${ROOT}"/tmp/${portroot#${ROOT}/}
 	for x in lib sbin bin; do
 		mkdir -p "${ROOT}"/tmp/usr/${x}
 		[[ -e ${ROOT}/tmp/${x} ]] || ( cd "${ROOT}"/tmp && ln -s usr/${x} )

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0d7f6b6eb00d0f51f35019846b8f79048b30be93
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 11:55:19 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 11:55:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0d7f6b6e

scripts/bootstrap-prefix: move RAP bootstrap profile to 17.1 for amd64

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 46a5ec10c4..ea559afe5c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -428,7 +428,7 @@ bootstrap_setup() {
 			;;
 		x86_64-pc-linux-gnu)
 			profile=${profile_linux/ARCH/amd64}
-			profile=${profile/17.0/17.0/no-multilib}
+			profile=${profile/17.0/17.1/no-multilib}
 			;;
 		ia64-pc-linux-gnu)
 			profile=${profile_linux/ARCH/ia64}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8559e1c3e77e54115746b61ad58d8a492ce8b024
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 13:01:43 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 13:01:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8559e1c3

scripts/bootstrap-prefix: add some code for GCC bootstrap on macOS

In addition, bump snapshot for package fixes.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ea559afe5c..34b6c25a82 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -183,8 +183,9 @@ configure_toolchain() {
 		app-crypt/rhash
 		dev-util/cmake
 		dev-util/ninja"
-	case ${CHOST} in
-		powerpc-*darwin*)
+
+	case ${CHOST}:${DARWIN_USE_GCC} in
+		powerpc-*darwin*|*:yes|*:1|*:true)
 			compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
 			local mycc=
@@ -207,6 +208,13 @@ configure_toolchain() {
 					linker=sys-devel/binutils-apple
 					mycc=gcc
 					;;
+				*"Apple clang version "*)
+					# gcc cannot build (recent) binutils-apple due to
+					# missing blocks support, so use Xcode provided
+					# linker/assembler
+					linker=sys-devel/native-cctools
+					mycc=gcc
+					;;
 				*)
 					eerror "unknown compiler"
 					return 1
@@ -414,7 +422,7 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
-		x86_64-apple-darwin19)
+		x86_64-apple-darwin19|x86_64-apple-darwin2[0123456789])
 			# handle newer releases on the last profile we have headers
 			# and stuff for (https://opensource.apple.com/)
 			profile="prefix/darwin/macos/10.14/x64"
@@ -505,6 +513,16 @@ bootstrap_setup() {
 		einfo "Your profile is set to ${fullprofile}."
 	fi
 
+	case ${DARWIN_USE_GCC} in
+		yes|1|true)
+			# setup MacOSX.sdk symlink for GCC, this should probably be
+			# managed using an eselect module in the future
+			( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk macosx) )
+			einfo "using system sources from $(\
+				xcrun --show-sdk-version --sdk macosx)"
+			;;
+	esac
+
 	is-rap && cat >> "${ROOT}"/etc/portage/make.profile/make.defaults <<-'EOF'
 	# For baselayout-prefix in stage2 only.
 	ACCEPT_KEYWORDS="~${ARCH}-linux"
@@ -576,7 +594,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20200607"
+	local PV="20201120"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2185ae8dc748888b8f86221018b77d4aac8770e8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 13:43:59 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 13:43:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2185ae8d

scripts/bootstrap-prefix: use latest portage which matches snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7edc5b9d3e..ca029edc21 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -660,8 +660,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="2.3.100"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.100"
+	STABLE_PV="3.0.8"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.8"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fd2058cbd9c38988b7b58e78f1c1d214273f329c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 13:42:20 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 13:42:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fd2058cb

scripts/bootstrap-prefix: clean up m4 bootstrapping

On macOS we need a patch (no newer version exists), so add it, else we
keep on having a crashing m4.
Remove all backup versions, since patching those versions fails, so
we'll stay on the fragile path and hope this works.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 34b6c25a82..7edc5b9d3e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -856,6 +856,10 @@ bootstrap_gnu() {
 		# doesn't match
 		sed -i -e '/_GL_WARN_ON_USE (gets/d' lib/stdio.in.h lib/stdio.h
 
+		# macOS 10.13 have an issue with %n, which crashes m4
+		efetch "http://rsync.prefix.bitzolder.nl/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch" || return 1
+		patch -p1 < "${DISTDIR}"/m4-1.4.18-darwin17-printf-n.patch || return 1
+
 		# Bug 715880
 		efetch http://dev.gentoo.org/~heroxbd/m4-1.4.18-glibc228.patch || return 1
 		patch -p1 < "${DISTDIR}"/m4-1.4.18-glibc228.patch || return 1
@@ -1304,10 +1308,7 @@ bootstrap_bison() {
 }
 
 bootstrap_m4() {
-	bootstrap_gnu m4 1.4.18 ||
-	bootstrap_gnu m4 1.4.17 ||
-	bootstrap_gnu m4 1.4.16 ||
-	bootstrap_gnu m4 1.4.15
+	bootstrap_gnu m4 1.4.18 # version is patched, so beware
 }
 
 bootstrap_gzip() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     224ac9a7692fc0cc66fe4fc2e63eed6596663c9f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 13:44:29 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 13:44:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=224ac9a7

scripts/bootstrap-prefix: avoid unnecessary rebuilds in stage1

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ca029edc21..e7f4ff194d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1383,28 +1383,42 @@ bootstrap_stage1() {
 	# packages following (e.g. zlib builds 64-bits)
 
 	# don't rely on $MAKE, if make == gmake packages that call 'make' fail
-	[[ $(make --version 2>&1) == *GNU" Make "4* ]] \
+	[[ -x ${ROOT}/tmp/usr/bin/make ]] \
+		|| [[ $(make --version 2>&1) == *GNU" Make "4* ]] \
 		|| (bootstrap_make) || return 1
 	[[ ${OFFLINE_MODE} ]] || [[ -x ${ROOT}/tmp/usr/bin/openssl ]] \
 		|| (bootstrap_libressl) # do not fail if this fails, we'll try without
 	[[ ${OFFLINE_MODE} ]] || type -P wget > /dev/null \
 		|| (bootstrap_wget) || return 1
-	[[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1
+	[[ -x ${ROOT}/tmp/usr/bin/sed ]] \
+		|| [[ $(sed --version 2>&1) == *GNU* ]] \
+		|| (bootstrap_sed) || return 1
 	type -P xz > /dev/null || (bootstrap_xz) || return 1
 	type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1
-	[[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \
+	[[ -x ${ROOT}/tmp/usr/bin/patch ]] \
+		|| [[ $(patch --version 2>&1) == *"patch 2."[6-9]*GNU* ]] \
 		|| (bootstrap_patch) || return 1
-	[[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1
+	[[ -x ${ROOT}/tmp/usr/bin/m4 ]] \
+		|| [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] \
+		|| (bootstrap_m4) || return 1
 	[[ -x ${ROOT}/tmp/usr/bin/bison ]] \
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
 		|| (bootstrap_bison) || return 1
-	[[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \
+	[[ -x ${ROOT}/tmp/usr/bin/uniq ]] \
+		|| [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \
 		|| (bootstrap_coreutils) || return 1
-	[[ $(find --version 2>&1) == *GNU* ]] || (bootstrap_findutils) || return 1
-	[[ $(tar --version 2>&1) == *GNU* ]] || (bootstrap_tar) || return 1
-	[[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1
-	[[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] \
+	[[ -x ${ROOT}/tmp/usr/bin/find ]] \
+		|| [[ $(find --version 2>&1) == *GNU* ]] \
+		|| (bootstrap_findutils) || return 1
+	[[ -x ${ROOT}/tmp/usr/bin/tar ]] \
+		|| [[ $(tar --version 2>&1) == *GNU* ]] \
+		|| (bootstrap_tar) || return 1
+	[[ -x ${ROOT}/tmp/usr/bin/grep ]] \
+		|| [[ $(grep --version 2>&1) == *GNU* ]] \
+		|| (bootstrap_grep) || return 1
+	[[ -x ${ROOT}/tmp/usr/bin/gawk ]] \
+		|| [[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] \
 		|| bootstrap_gawk || return 1
 	# always build our own bash, for we don't know what devilish thing
 	# we're working with now, bug #650284

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     feb0124810202854af925a84f63fb30d43aff56a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 14:28:09 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 14:28:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=feb01248

scripts/bootstrap-prefix: move llvm_deps into only consuming block

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e7f4ff194d..f45bf57b73 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -178,11 +178,6 @@ configure_toolchain() {
 
 	CC=gcc
 	CXX=g++
-	llvm_deps="
-		app-arch/libarchive
-		app-crypt/rhash
-		dev-util/cmake
-		dev-util/ninja"
 
 	case ${CHOST}:${DARWIN_USE_GCC} in
 		powerpc-*darwin*|*:yes|*:1|*:true)
@@ -229,6 +224,11 @@ configure_toolchain() {
 			compiler_type="clang"
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
 			local mycc=
+			local llvm_deps="
+				app-arch/libarchive
+				app-crypt/rhash
+				dev-util/cmake
+				dev-util/ninja"
 			case "${ccvers}" in
 				*"Apple clang version "*)
 					vers=${ccvers#*Apple clang version }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     21808d104ee069ca4d9077784b8cf0d861f63fd1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 17:18:13 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 17:18:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=21808d10

scripts/bootstrap-prefix: adjust/fix Darwin FSF GCC path

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f45bf57b73..80c2b8eb8b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -181,43 +181,39 @@ configure_toolchain() {
 
 	case ${CHOST}:${DARWIN_USE_GCC} in
 		powerpc-*darwin*|*:yes|*:1|*:true)
-			compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
+			einfo "Triggering Darwin with GCC toolchain path"
+			compiler_stage1+=" sys-apps/darwin-miscutils sys-libs/csu"
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
-			local mycc=
 			case "${ccvers}" in
 				*"(GCC) 4.2.1 "*)
 					linker=sys-devel/binutils-apple
-					mycc=gcc
 					;;
 				*"(GCC) 4.0.1 "*)
 					linker="=sys-devel/binutils-apple-3.2"
+					# upgrade to 4.2.1 first
 					compiler_stage1+="
-						${gcc_deps}
-						sys-devel/gcc-config
 						sys-devel/gcc-apple
 						sys-devel/binutils-apple"
-					mycc=gcc
 					;;
 				*"(Gentoo "*)
 					# probably the result of a bootstrap in progress
 					linker=sys-devel/binutils-apple
-					mycc=gcc
 					;;
-				*"Apple clang version "*)
+				*"Apple clang version "*|*"Apple LLVM version "*)
 					# gcc cannot build (recent) binutils-apple due to
 					# missing blocks support, so use Xcode provided
 					# linker/assembler
 					linker=sys-devel/native-cctools
-					mycc=gcc
 					;;
 				*)
-					eerror "unknown compiler"
+					eerror "unknown compiler: ${ccvers}"
 					return 1
 					;;
 			esac
-			compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc"
+			compiler_stage1+=" sys-devel/gcc"
 			;;
 		*-darwin*)
+			einfo "Triggering Darwin with Clang toolchain path"
 			# for compilers choice, see bug:
 			# https://bugs.gentoo.org/show_bug.cgi?id=538366
 			compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
@@ -1734,6 +1730,21 @@ bootstrap_stage2() {
 	[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \
 		>> "${ROOT}"/tmp/etc/portage/package.mask
 
+	# unlock GCC on Darwin for DARWIN_USE_GCC bootstraps
+	if [[ ${DARWIN_USE_GCC} == 1 || ${DARWIN_USE_GCC} == "yes" || \
+		${DARWIN_USE_GCC} == "true" ]]
+	then
+		{
+			echo "# DARWIN_USE_GCC block"
+			echo "sys-devel/gcc"
+			echo "sys-devel/native-cctools"
+		} >> "${ROOT}"/tmp/etc/portage/package.unmask
+		{
+			echo "# DARWIN_USE_GCC block"
+			echo "sys-devel/gcc ~ppc-macos"
+		} >> "${ROOT}"/tmp/etc/portage/package.accept_keywords
+	fi
+
 	# cmake has some external dependencies which require autoconf, etc.
 	# unless we only build the buildtool, bug #603012
 	echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0ccf7c8d3af43ed124903a51a56ec9777bcbf18d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 10:26:16 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 10:26:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0ccf7c8d

scripts/bootstrap-prefix: use xattr-fixed Portage to bootstrap

in addition, set SDK in use in tmp offset too

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 80c2b8eb8b..458d18cc55 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -656,8 +656,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="3.0.8"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.8"
+	STABLE_PV="3.0.10.1"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.10.1"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"
@@ -1743,6 +1743,9 @@ bootstrap_stage2() {
 			echo "# DARWIN_USE_GCC block"
 			echo "sys-devel/gcc ~ppc-macos"
 		} >> "${ROOT}"/tmp/etc/portage/package.accept_keywords
+
+		rm -f "${ROOT}"/tmp/MacOSX.sdk
+		( cd "${ROOT}"/tmp && ln -s ../MacOSX.sdk )
 	fi
 
 	# cmake has some external dependencies which require autoconf, etc.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     eaf9a9adf47f7cbfee387c9055373dc7a6c76b92
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 21:06:20 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 21:06:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=eaf9a9ad

scripts/bootstrap-prefix: use profiles for later macOS releases

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9ad307e1cd..e37683b0f7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -420,15 +420,13 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
-		x86_64-apple-darwin9|x86_64-apple-darwin1[012345678])
+		x86_64-apple-darwin9|x86_64-apple-darwin1[0123456789])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
-		x86_64-apple-darwin19|x86_64-apple-darwin2[0123456789])
-			# TODO: add profiles for these
-			# handle newer releases on the last profile we have headers
-			# and stuff for (https://opensource.apple.com/)
-			profile="prefix/darwin/macos/10.14/x64"
+		x86_64-apple-darwin2[0123456789])
+			# Big Sur is 11.0
+			profile="prefix/darwin/macos/11.$((rev - 20))/x64"
 			;;
 		i*86-pc-linux-gnu)
 			profile=${profile_linux/ARCH/x86}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     41a349e4c2d23aee41ae0cf8c30a9412bf1e1039
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 08:46:08 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 08:46:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=41a349e4

scripts/bootstrap-prefix: bump bootstrap tree

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e37683b0f7..497e35eadb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -593,7 +593,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201120"
+	local PV="20201123"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7a3cc78493b205c0ea11e8f6fe64d4e91ecbb55d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 09:44:13 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 09:47:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7a3cc784

scripts/bootstrap-prefix: rework Xcode checks

- don't require /usr/include (recent systems don't have it)
- don't require CommandLineTools (any MacOSX.sdk will do)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 497e35eadb..3224bb47b5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2472,20 +2472,17 @@ EOF
 	fi
 
 	if type -P xcode-select > /dev/null ; then
-		if [[ ! -d /usr/include ]] ; then
-			# bug #512032
-			cat << EOF
+		if [[ -d /usr/include ]] ; then
+			# if we have /usr/include we're on an older system
+			if [[ ${CHOST} == powerpc* ]]; then
+				# ancient Xcode (3.0/3.1)
+				cat << EOF
 
-You don't have /usr/include, this thwarts me to build stuff.
-Please execute:
-  xcode-select --install
-or install /usr/include in another way and try running me again.
+Ok, this is an old system, let's just try and see what happens.
 EOF
-			exit 1
-		fi
-		if [[ $(xcode-select -p) != */CommandLineTools ]] ; then
-			# to an extent, bug #564814 and bug #562800
-			cat << EOF
+			elif [[ $(xcode-select -p) != */CommandLineTools ]] ; then
+				# to an extent, bug #564814 and bug #562800
+				cat << EOF
 
 Your xcode-select is not set to CommandLineTools.  This prevents builds
 from succeeding.  Switch to command line tools for the bootstrap to
@@ -2493,14 +2490,17 @@ continue.  Please execute:
   xcode-select -s /Library/Developer/CommandLineTools
 and try running me again.
 EOF
-			if ! xcode-select -p > /dev/null && [[ ${CHOST} == powerpc* ]]; then
-				# ancient Xcode (3.0/3.1)
+			fi
+		else
+			# let's see if we have an xcode install
+			if [[ ! -e $(xcrun -f gcc 2>/dev/null) ]] ; then
 				cat << EOF
 
-Ok, this is an old system, let's just try and see what happens.
+You don't have Xcode installed, or xcode-select isn't pointing to a
+valid install.  Try resetting it using:
+  sudo xcode-select -r
+and try running me again.
 EOF
-			else
-				exit 1
 			fi
 		fi
 	fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     790893167b44f6acc7677bebb2301809093320b6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 11:24:43 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 11:24:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=79089316

scripts/bootstrap-prefix: give macOS SDK with predictable name

it appears sometimes the SDK in use is called MacOSX.sdk, sometimes it's
something like MacOSX10.14.sdk, ensure it's always the same name

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3224bb47b5..63840ce431 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -505,7 +505,7 @@ bootstrap_setup() {
 	if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
 		# setup MacOSX.sdk symlink for GCC, this should probably be
 		# managed using an eselect module in the future
-		( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk macosx) )
+		( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk macosx) MacOSX.sdk )
 		einfo "using system sources from $(\
 			xcrun --show-sdk-version --sdk macosx)"
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d5b81976c9ddbb692245cdfaa591fd61e7ca0558
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 19:10:10 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 19:10:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d5b81976

scripts/bootstrap-prefix: bump bootstrap snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 63840ce431..34dba4f491 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -593,7 +593,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201123"
+	local PV="20201124"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     765789c5afa47e76f747c16556b6066e12899cd0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 19:53:09 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 19:53:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=765789c5

scripts/bootstrap-prefix: bootstrap gawk 5.0.1 for macOS Big Sur

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 34dba4f491..d821b14394 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1283,7 +1283,7 @@ bootstrap_patch() {
 }
 
 bootstrap_gawk() {
-	bootstrap_gnu gawk 4.0.1 || bootstrap_gnu gawk 4.0.0 || \
+	bootstrap_gnu gawk 5.0.1 || bootstrap_gnu gawk 4.0.1 || \
 		bootstrap_gnu gawk 3.1.8
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     95d867733fb20a3bb533ce97250497127bfcc048
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 20:19:22 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 20:19:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=95d86773

scripts/bootstrap-python: update versions of bash and Python for Big Sur

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d821b14394..c5b3f7ef2c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -965,7 +965,7 @@ bootstrap_gnu() {
 
 PYTHONMAJMIN=3.7   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-	PV=3.7.7
+	PV=3.7.8
 	A=Python-${PV}.tar.xz
 	patch=true
 
@@ -1296,6 +1296,7 @@ bootstrap_texinfo() {
 }
 
 bootstrap_bash() {
+	bootstrap_gnu bash 5.1-rc3 ||
 	bootstrap_gnu bash 4.3 ||
 	bootstrap_gnu bash 4.2
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b269169a760e2967016791fb185613d33c2a7acf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 20:26:40 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 20:26:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b269169a

scripts/bootstrap-prefix: misc fixes for Big Sur profile setting

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c5b3f7ef2c..02ae37585d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -426,6 +426,7 @@ bootstrap_setup() {
 			;;
 		x86_64-apple-darwin2[0123456789])
 			# Big Sur is 11.0
+			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/11.$((rev - 20))/x64"
 			;;
 		i*86-pc-linux-gnu)
@@ -505,9 +506,10 @@ bootstrap_setup() {
 	if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
 		# setup MacOSX.sdk symlink for GCC, this should probably be
 		# managed using an eselect module in the future
-		( cd ${ROOT} && ln -s $(xcrun --show-sdk-path --sdk macosx) MacOSX.sdk )
-		einfo "using system sources from $(\
-			xcrun --show-sdk-version --sdk macosx)"
+		rm -f "${ROOT}"/MacOSX.sdk
+		local SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
+		( cd "${ROOT}" && ln -s "${SDKPATH}" MacOSX.sdk )
+		einfo "using system sources from ${SDKPATH}"
 
 		# amend profile, to use gcc one
 		profile="${profile}/gcc"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2fda1225f366f1ec1ce4d0ec4f15e5376dc9a572
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 10:32:47 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 10:32:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2fda1225

scripts/bootstrap-prefix: refresh snapshot for latest fixes

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 02ae37585d..759e06e172 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -595,7 +595,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201124"
+	local PV="20201126"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     74d2d6f731bfec531a2effefb10aabe842238078
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 10:26:20 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 10:26:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=74d2d6f7

scripts/bootstrap-prefix: bump tree and portage snapshot

- bump tree snapshot for assorted Big Sur fixes
- bump portage snapshot for symbols check fix on Big Sur

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 759e06e172..595a0019f3 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -595,7 +595,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201126"
+	local PV="20201128"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -661,8 +661,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="3.0.10.1"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.10.1"
+	STABLE_PV="3.0.10.2"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.10.2"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7ea8db718ae317d062bb7a293a8ffb901276b1f9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 10:15:09 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 10:15:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7ea8db71

scripts/bootstrap-prefix: default to GCC build on Darwin

The GCC builds have been verified on 10.13, 10.15 and 11.0 and are
functional enough to be used, as well as can be used to extend/build out
to LLVM/Clang toolchain (which isn't yet working).
Allow people for the time being to at least produce a working Prefix.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 595a0019f3..159fc88d9a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3088,6 +3088,8 @@ case ${CHOST} in
 		# normalise value of DARWIN_USE_GCC
 		case ${DARWIN_USE_GCC} in
 			yes|true|1)  DARWIN_USE_GCC=1  ;;
+			no|false|0)  DARWIN_USE_GCC=0  ;;
+			*)           DARWIN_USE_GCC=1  ;;   # default to GCC build
 		esac
 		;;
 	*)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     63a395a7bd086259dcd12edd344e528b54233327
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 19:18:45 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 19:19:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=63a395a7

scripts/bootstrap-prefix: add powerpc64le profile setup

Bug: https://bugs.gentoo.org/755551
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 159fc88d9a..23c8c32264 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -440,10 +440,13 @@ bootstrap_setup() {
 			profile=${profile_linux/ARCH/ia64}
 			;;
 		powerpc-unknown-linux-gnu)
-			profile=${profile_linux/ARCH/powerpc/ppc}
+			profile=${profile_linux/ARCH/ppc}
 			;;
 		powerpc64-unknown-linux-gnu)
-			profile=${profile_linux/ARCH/powerpc/ppc64}
+			profile=${profile_linux/ARCH/ppc64}
+			;;
+		powerpc64le-unknown-linux-gnu)
+			profile=${profile_linux/ARCH/ppc64le}
 			;;
 		aarch64-unknown-linux-gnu)
 			profile=${profile_linux/ARCH/arm64}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f712420e0bd2931f5a86bf3e9fe9e9123ea44ad3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 10:35:14 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 10:37:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f712420e

scripts/bootstrap-prefix: don't do SDK linking on old Darwin

powerpc-*-darwin9 is old, and doesn't have SDKs of the sort recent
systems have, so don't trigger this code-path.  Darwin 9 actually uses a
hybrid path with FSF-GCC and Apple GCC 4.2.1 for building its linker.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 23c8c32264..06f78c9390 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3087,6 +3087,9 @@ esac
 
 # handle GCC install path on recent Darwin
 case ${CHOST} in
+	powerpc-*darwin*)
+		unset DARWIN_USE_GCC  # there is no choice here, don't trigger SDK path
+		;;
 	*-darwin*)
 		# normalise value of DARWIN_USE_GCC
 		case ${DARWIN_USE_GCC} in

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     66588dcd0aa2508fad7ab8db5e92a0b4c2e75d6d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 10:58:24 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 10:58:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=66588dcd

scripts/bootstrap-prefix: fix gawk merge in stage3 for darwin9

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 06f78c9390..bed81f04ea 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2039,7 +2039,8 @@ bootstrap_stage3() {
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 
 	# need special care, it depends on texinfo, #717786
-	pre_emerge_pkgs --nodeps sys-apps/gawk || return 1
+	# but requires a recent readline else breaks on old, e.g. darwin9
+	pre_emerge_pkgs --nodeps sys-libs/readline sys-apps/gawk || return 1
 
 	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python${PYTHONMAJMIN} )
 	# Use $ROOT tools where possible from now on.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d05e8fa62e24a99468fc3a0fac1fb7a8b621eac4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 18:09:25 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 18:09:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d05e8fa6

scripts/bootstrap-portage: use latest portage, python 3.8

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bed81f04ea..37e87ac08b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -664,8 +664,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="3.0.10.2"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.10.2"
+	STABLE_PV="3.0.12"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.12"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%-*}"
@@ -968,9 +968,9 @@ bootstrap_gnu() {
 	einfo "${PN}-${PV} successfully bootstrapped"
 }
 
-PYTHONMAJMIN=3.7   # keep this number in line with PV below for stage1,2
+PYTHONMAJMIN=3.8   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-	PV=3.7.8
+	PV=3.8.5
 	A=Python-${PV}.tar.xz
 	patch=true
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     29becc5018f1adc4a3ce624ef87e7ef9b487585a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 07:25:04 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec  8 07:26:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=29becc50

scripts/bootstrap-prefix: bump snapshot for misc pkg updates

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 37e87ac08b..9ef524a1ad 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -598,7 +598,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201128"
+	local PV="20201207"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ebb00fb4daf03d424060dbb26ffc5bde91c24a78
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 11:34:39 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 11:36:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ebb00fb4

scripts/bootstrap-prefix: disable emerge colour output during stage{1,2,3}

To make the stage logs a bit more readable, disable colour output, so we
don't get many fancy ANSI escape codes.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9ef524a1ad..8a59bb1ba5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1618,7 +1618,7 @@ do_emerge_pkgs() {
 			PORTAGE_SYNC_STALE=0 \
 			FEATURES="-news ${FEATURES}" \
 			USE="${myuse[*]}" \
-			emerge -v --oneshot --root-deps ${opts} "${pkg}" 
+			emerge --color n -v --oneshot --root-deps ${opts} "${pkg}"
 		)
 		[[ $? -eq 0 ]] || return 1
 
@@ -2103,7 +2103,7 @@ bootstrap_stage3() {
 		# snapshot beforehand
 		emerge-webrsync --keep || return 1
 	else
-		emerge --sync || emerge-webrsync || return 1
+		emerge --color n --sync || emerge-webrsync || return 1
 	fi
 
 	# avoid installing git or encryption just for fun while completing @system
@@ -2115,11 +2115,11 @@ bootstrap_stage3() {
 	# very well on Darwin (-DGNUSTEP_BASE_VERSION hack)
 	einfo "running emerge -u system"
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
-	CFLAGS= CXXFLAGS= emerge -u system || return 1
+	CFLAGS= CXXFLAGS= emerge --color n -u system || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"
-	emerge --depclean
+	emerge --color n --depclean
 
 	# "wipe" mtimedb such that the resume list is proper after this stage
 	# (--depclean may fail, which is ok)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0c3888b00fe6ecbe61abac0c32f1879454f6c743
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 15:55:43 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 15:55:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0c3888b0

scripts/bootstrap-prefix: bump snapshot for gettext fix

should fix gettext-0.21 failure in stage3 on Darwin

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8a59bb1ba5..b73dbc3ff4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -598,7 +598,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201207"
+	local PV="20201208"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     1316d6b9d15c894453119035991559982480c68a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 19:23:03 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:23:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1316d6b9

scripts/bootstrap-prefix: USE=-readline for linux bootstrap

util-linux wants readline, but that isn't critical yet it gives us
dependency problems, so simply mask it out, the final emerge -e system
will pull everything back in order anyway

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b73dbc3ff4..c6a79b1ec5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1575,6 +1575,7 @@ do_emerge_pkgs() {
 			-pcre
 			-python
 			-qmanifest -qtegrity
+			-readline
 			bootstrap
 			clang
 			internal-glib

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4f6bd387dfd5f4c41aa492d915f27c523cdb03d9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 07:15:07 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 07:15:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4f6bd387

scripts/bootstrap-prefix: bump snapshot for Linux non-RAP fixes

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c6a79b1ec5..c7e30db10d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -598,7 +598,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201208"
+	local PV="20201209"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     1520dcb2fce8067598d15159e7e71976e2c85f6f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 12:16:01 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 12:16:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1520dcb2

Revert "scripts/bootstrap-prefix: fix gawk merge in stage3 for darwin9"

This reverts commit 66588dcd0aa2508fad7ab8db5e92a0b4c2e75d6d.

Since we disable readline in USE-flags, the readline dep shouldn't be
there any more.

Thanks Etienne Buira for the pointer.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c7e30db10d..20748bde66 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2040,8 +2040,7 @@ bootstrap_stage3() {
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 
 	# need special care, it depends on texinfo, #717786
-	# but requires a recent readline else breaks on old, e.g. darwin9
-	pre_emerge_pkgs --nodeps sys-libs/readline sys-apps/gawk || return 1
+	pre_emerge_pkgs --nodeps sys-apps/gawk || return 1
 
 	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python${PYTHONMAJMIN} )
 	# Use $ROOT tools where possible from now on.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     05ecbecb5e3633e2ae35c7784151227eb65ef5d6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 08:00:57 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 08:00:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=05ecbecb

scripts/bootstrap-prefix: bump snapshot for Darwin and Solaris fixes

- Darwin 9: fix Python 3.8 compilation
- Solaris: fix bootstrap with Solaris nm (due to toolchain.eclass
  forcing NM=nm)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bd518bfcbc..83d821f22b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -603,7 +603,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201209"
+	local PV="20201210"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     889898a2eac57b319d3e83da4f64b055b0b2aaef
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 09:06:16 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 09:20:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=889898a2

scripts/bootstap-prefix: bump snapshot for python-3.8.6 emerge fail

this should fix darwin bootstraps again

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 83d821f22b..4556866596 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -603,7 +603,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201210"
+	local PV="20201211"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2a343ee4431b6b354129a0bcec6817b9693d0375
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 21:02:45 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 21:02:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2a343ee4

scripts/bootstrap-prefix: add whacking to finish stage1 on arm64-darwin

Sssssht, don't tell anyone.  Initial profile coming soon, nowhere near a
working setup yet.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 59 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4556866596..01e40e9bda 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -434,6 +434,10 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/11.$((rev - 20))/x64"
 			;;
+		arm64-apple-darwin2[0123456789])
+			rev=${CHOST##*darwin}
+			profile="prefix/darwin/macos/11.$((rev - 20))/arm64"
+			;;
 		i*86-pc-linux-gnu)
 			profile=${profile_linux/ARCH/x86}
 			;;
@@ -511,14 +515,21 @@ bootstrap_setup() {
 			;;
 	esac
 
-	if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
+	if [[ ${CHOST} == *-darwin* ]] ; then
 		# setup MacOSX.sdk symlink for GCC, this should probably be
 		# managed using an eselect module in the future
 		rm -f "${ROOT}"/MacOSX.sdk
 		local SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
+		if [[ -e ${SDKPATH} ]] ; then
+			SDKPATH=$(xcodebuild -showsdks | sort -nr \
+				| grep -o "macosx.*" | head -n1)
+			SDKPATH=$(xcode-select -print-path)/SDKs/MacOSX${SDKPATH#macosx}.sdk
+		fi
 		( cd "${ROOT}" && ln -s "${SDKPATH}" MacOSX.sdk )
 		einfo "using system sources from ${SDKPATH}"
+	fi
 
+	if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
 		# amend profile, to use gcc one
 		profile="${profile}/gcc"
 	fi
@@ -687,6 +698,8 @@ bootstrap_portage() {
 	S="${S}/prefix-portage-${PV}"
 	cd "${S}"
 
+	fix_config_sub
+
 	# disable ipc
 	sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
 		-i lib/_emerge/AbstractEbuildProcess.py || \
@@ -743,6 +756,20 @@ bootstrap_portage() {
 	einfo "${A%-*} successfully bootstrapped"
 }
 
+fix_config_sub() {
+	# macOS Big Sur (11.x, darwin20) supports Apple Silicon (arm64),
+	# which config.sub doesn't understand about.  It is, however, Apple
+	# who seem to use arm64-apple-darwin20 CHOST triplets, so patch that
+	# for various versions of autoconf
+	if [[ ${CHOST} == arm64-apple-darwin* ]] ; then
+		# Apple Silicon doesn't use aarch64, but arm64
+		find . -name "config.sub" | \
+			xargs sed -i -e 's/ arm\(-\*\)* / arm\1 | arm64\1 /'
+		find . -name "config.sub" | \
+			xargs sed -i -e 's/ aarch64 / aarch64 | arm64 /'
+	fi
+}
+
 bootstrap_simple() {
 	local PN PV A S myconf
 	PN=$1
@@ -766,6 +793,8 @@ bootstrap_simple() {
 	S="${S}"/${PN}-${PV}
 	cd "${S}"
 
+	fix_config_sub
+
 	# for libressl, only provide static lib, such that wget (above)
 	# links it in and we don't have to bother about RPATH or something
 	if [[ ${PN} == "libressl" ]] ; then
@@ -874,6 +903,8 @@ bootstrap_gnu() {
 		patch -p1 < "${DISTDIR}"/m4-1.4.18-glibc228.patch || return 1
 	fi
 
+	fix_config_sub
+
 	if [[ ${PN} == "grep" ]] ; then
 		# Solaris and OSX don't like it when --disable-nls is set,
 		# so just don't set it at all.
@@ -950,6 +981,10 @@ bootstrap_gnu() {
 		(i?86-*-*)
 			export CFLAGS="-m32"
 			;;
+		(arm64-*-darwin*)
+			sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \
+				configure configure.host
+			;;
 		esac
 	fi
 
@@ -1044,8 +1079,16 @@ bootstrap_python() {
 		efetch "http://dev.gentoo.org/~grobian/distfiles/python-3.8.6-darwin9.patch"
 		patch -p1 < "${DISTDIR}"/python-3.8.6-darwin9.patch
 		;;
+	(arm64-*-darwin*)
+		# Teach Python a new trick (arm64)
+		sed -i \
+			-e "/Unexpected output of 'arch' on OSX/d" \
+			configure
+		;;
 	esac
 
+	fix_config_sub
+
 	local myconf=""
 
 	case $CHOST in
@@ -1228,6 +1271,7 @@ bootstrap_zlib() {
 }
 
 bootstrap_libffi() {
+	bootstrap_gnu libffi 3.3 || \
 	bootstrap_gnu libffi 3.2.1
 }
 
@@ -1738,8 +1782,8 @@ bootstrap_stage2() {
 	[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \
 		>> "${ROOT}"/tmp/etc/portage/package.mask
 
-	# unlock GCC on Darwin for DARWIN_USE_GCC bootstraps
-	if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
+	# provide active SDK link on Darwin
+	if [[ ${CHOST} == *-darwin* ]] ; then
 		rm -f "${ROOT}"/tmp/MacOSX.sdk
 		( cd "${ROOT}"/tmp && ln -s ../MacOSX.sdk )
 	fi
@@ -2579,6 +2623,7 @@ EOF
 		*86*-darwin9|*86*-darwin1[012345])
 			# PPC/Darwin only works in 32-bits mode, so this is Intel
 			# only, and only starting from Leopard (10.5, darwin9)
+			# with Big Sur (11.0, darwin20) we have x64 or arm64 only
 			candomultilib=yes
 			t64=x86_64-${CHOST#*-}
 			t32=i686-${CHOST#*-}
@@ -3009,9 +3054,11 @@ if [[ -z ${CHOST} ]]; then
 				;;
 			Darwin)
 				rev="`uname -r | cut -d'.' -f 1`"
-				if [[ ${rev} -ge 11 ]] ; then
+				if [[ ${rev} -ge 11 && ${rev} -le 19 ]] ; then
 					# Lion and up are 64-bits default (and 64-bits CPUs)
 					CHOST="x86_64-apple-darwin$rev"
+				elif [[ ${rev} -ge 20 ]] ; then
+					CHOST="`uname -m`-apple-darwin$rev"
 				else
 					CHOST="`uname -p`-apple-darwin$rev"
 				fi
@@ -3086,8 +3133,8 @@ esac
 
 # handle GCC install path on recent Darwin
 case ${CHOST} in
-	powerpc-*darwin*)
-		unset DARWIN_USE_GCC  # there is no choice here, don't trigger SDK path
+	powerpc-*darwin*|arm64-*darwin*)
+		unset DARWIN_USE_GCC  # there is no choice here, don't trigger GCC path
 		;;
 	*-darwin*)
 		# normalise value of DARWIN_USE_GCC

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8a3521c24f0ea7fa6558c127dc65af6fb34da867
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 08:14:23 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 08:14:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8a3521c2

scripts/bootstrap-prefix: fix SDKPATH logic, add comments

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 01e40e9bda..c085472a23 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -520,7 +520,7 @@ bootstrap_setup() {
 		# managed using an eselect module in the future
 		rm -f "${ROOT}"/MacOSX.sdk
 		local SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
-		if [[ -e ${SDKPATH} ]] ; then
+		if [[ ! -e ${SDKPATH} ]] ; then
 			SDKPATH=$(xcodebuild -showsdks | sort -nr \
 				| grep -o "macosx.*" | head -n1)
 			SDKPATH=$(xcode-select -print-path)/SDKs/MacOSX${SDKPATH#macosx}.sdk
@@ -3058,6 +3058,9 @@ if [[ -z ${CHOST} ]]; then
 					# Lion and up are 64-bits default (and 64-bits CPUs)
 					CHOST="x86_64-apple-darwin$rev"
 				elif [[ ${rev} -ge 20 ]] ; then
+					# uname -p returns arm, -m returns arm64 on this
+					# release while on Darwin 9 -m returns something
+					# like "PowerPC Machine", hence the distinction
 					CHOST="`uname -m`-apple-darwin$rev"
 				else
 					CHOST="`uname -p`-apple-darwin$rev"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     1e030951dd8c4099e45395e513e3cf73b0c3d69a
Author:     Alexei Colin <ac <AT> alexeicolin <DOT> com>
AuthorDate: Wed Dec 23 06:18:44 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 07:50:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1e030951

bootstrap-prefix: bump tar to 1.32, apply ioctl patch

On macOS 11 Big Sur, stage 1 needs to bootstrap tar but fails to build
it (both 1.26 and 1.32) because sys/ioctl.h does not end up included:

    compare.c:550:3: error: implicit declaration of function 'ioctl' is
invalid in C99 [-Werror,-Wimplicit-function-declaration]
      ioctl (archive, FDFLUSH);

Upstream bug report: https://savannah.gnu.org/bugs/index.php?59755

Closes: https://bugs.gentoo.org/761322
Signed-off-by: Alexei Colin <ac <AT> alexeicolin.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c085472a23..3f96bc5e33 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -862,6 +862,22 @@ bootstrap_gnu() {
 	[[ -d ${S} ]] || return 1
 	cd "${S}" || return 1
 
+	# Tar upstream bug #59755 for broken build on macOS:
+	# https://savannah.gnu.org/bugs/index.php?59755
+	if [[ ${PN}-${PV} == "tar-1.32" ]] ; then
+		local tar_patch_file="tar-1.32-check-sys-ioctl-header-configure.patch"
+		local tar_patch_id="file_id=50554"
+		local tar_patch_url="https://file.savannah.gnu.org/file/${tar_patch_file}?${tar_patch_id}"
+		efetch "${tar_patch_url}" || return 1
+		# If fetched from upstream url instead of mirror, filename will
+		# have a suffix. Remove suffix by copy, not move, to not
+		# trigger refetch on repeated invocations of this script.
+		if [[ -f "${DISTDIR}/${tar_patch_file}?${tar_patch_id}" ]]; then
+			cp ${DISTDIR}/${tar_patch_file}{?${tar_patch_id},} || return 1
+		fi
+		patch -p1 < ${DISTDIR}/${tar_patch_file} || return 1
+	fi
+
 	if [[ ${PN}-${PV} == "bash-4.3" && ${CHOST} == *-cygwin* ]] ; then
 		local p patchopts
 		for p in \
@@ -1309,7 +1325,7 @@ bootstrap_coreutils() {
 }
 
 bootstrap_tar() {
-	bootstrap_gnu tar 1.26
+	bootstrap_gnu tar 1.32
 }
 
 bootstrap_make() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     06afbd463702f037c0217a8246ac856dcd0df09c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 07:49:44 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 07:50:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=06afbd46

scripts/bootstrap-prefix: fall back to tar 1.26 just in case

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3f96bc5e33..2f0fdb6fdf 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1325,7 +1325,7 @@ bootstrap_coreutils() {
 }
 
 bootstrap_tar() {
-	bootstrap_gnu tar 1.32
+	bootstrap_gnu tar 1.32 || bootstrap_gnu tar 1.26
 }
 
 bootstrap_make() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2d2c64938644a41bf199a8d73abc97f1b0bdbd55
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 15:08:53 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 15:08:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2d2c6493

scripts/bootstrap-prefix: add some darwin-related changes

- bootstrap cmake (stage1) on a Darwin profile without GCC, such that we
  can bootstrap llvm without having to get cmake which has too many
  (problematic) deps
- use native-cctool to avoid bootstrapping binutils-apple, which is
  difficult to get given its (compiler) dependencies

(this make a bunch of things unnecessary from
https://github.com/gentoo/prefix/pull/1)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 91 +++++++++++++++++++++++++++++++--------------
 1 file changed, 63 insertions(+), 28 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2f0fdb6fdf..1943a3929b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -185,26 +185,29 @@ configure_toolchain() {
 			compiler_stage1+=" sys-apps/darwin-miscutils sys-libs/csu"
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
 			case "${ccvers}" in
+				*"(Gentoo "*)
+					# probably the result of a bootstrap in progress
+					[[ ${DARWIN_USE_GCC} == 1 ]] \
+						&& linker=sys-devel/native-cctools \
+						|| linker=sys-devel/binutils-apple
+					;;
 				*"(GCC) 4.2.1 "*)
 					linker=sys-devel/binutils-apple
 					;;
 				*"(GCC) 4.0.1 "*)
-					linker="=sys-devel/binutils-apple-3.2"
+					linker="=sys-devel/binutils-apple-3.2.6"
 					# upgrade to 4.2.1 first
 					compiler_stage1+="
 						sys-devel/gcc-apple
 						sys-devel/binutils-apple"
 					;;
-				*"(Gentoo "*)
-					# probably the result of a bootstrap in progress
-					[[ ${DARWIN_USE_GCC} == 1 ]] \
-						&& linker=sys-devel/native-cctools \
-						|| linker=sys-devel/binutils-apple
-					;;
 				*"Apple clang version "*|*"Apple LLVM version "*)
 					# gcc cannot build (recent) binutils-apple due to
 					# missing blocks support, so use Xcode provided
 					# linker/assembler
+					# UPDATE: binutils-8.2.1-r100 compiles, but the
+					# assembler isn't able to deal with AVX instructions
+					# (yet)
 					linker=sys-devel/native-cctools
 					;;
 				*)
@@ -222,11 +225,7 @@ configure_toolchain() {
 			compiler_type="clang"
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
 			local mycc=
-			local llvm_deps="
-				app-arch/libarchive
-				app-crypt/rhash
-				dev-util/cmake
-				dev-util/ninja"
+			local llvm_deps="dev-util/ninja"
 			case "${ccvers}" in
 				*"Apple clang version "*)
 					vers=${ccvers#*Apple clang version }
@@ -241,7 +240,11 @@ configure_toolchain() {
 						sys-libs/libcxx"
 					CC=clang
 					CXX=clang++
-					linker=sys-devel/binutils-apple
+					# avoid going through hoops and deps for
+					# binutils-apple, rely on the host-installed ld to
+					# build a compiler, we'll pull in binutils-apple
+					# from system set
+					linker=sys-devel/native-cctools
 					;;
 				*"Apple LLVM version "*)
 					vers=${ccvers#*Apple LLVM version }
@@ -267,21 +270,8 @@ configure_toolchain() {
 					esac
 					CC=clang
 					CXX=clang++
-					linker=sys-devel/binutils-apple
-					;;
-				*"(GCC) 4.2.1 "*)
-					linker=sys-devel/binutils-apple
-					mycc=gcc
-					;;
-				*"(GCC) 4.0.1 "*)
-					# need gcc-4.2.1 to compile llvm
-					linker="=sys-devel/binutils-apple-3.2"
-					compiler_stage1+="
-						${gcc_deps}
-						sys-devel/gcc-config
-						sys-devel/gcc-apple
-						sys-devel/binutils-apple"
-					mycc=gcc
+					# see above for reasoning
+					linker=sys-devel/native-cctools
 					;;
 				*)
 					eerror "unknown compiler"
@@ -557,6 +547,14 @@ bootstrap_setup() {
 	sys-devel/binutils -cxx
 	EOF
 
+	# On Darwin we might need this to bootstrap the compiler, since
+	# bootstrapping the linker (binutils-apple) requires a c++11
+	# compiler amongst other things
+	cat >> "${ROOT}"/etc/portage/make.profile/package.unmask <<-EOF
+	# For Darwin bootstraps
+	sys-devel/native-cctools
+	EOF
+
 	# Strange enough, -cxx causes wrong libtool config on Cygwin,
 	# but we require a C++ compiler there anyway - so just use it.
 	[[ ${CHOST} == *-cygwin* ]] ||
@@ -1197,6 +1195,34 @@ bootstrap_python() {
 	einfo "${A%-*} bootstrapped"
 }
 
+bootstrap_cmake() {
+	PV=${1:-3.13.4}
+	A=cmake-${PV}.tar.gz
+
+	einfo "Bootstrapping ${A%-*}"
+
+	efetch https://github.com/Kitware/CMake/releases/download/v${PV}/${A} \
+		|| return 1
+
+	einfo "Unpacking ${A%%-*}"
+	export S="${PORTAGE_TMPDIR}/cmake-${PV}"
+	rm -rf "${S}"
+	mkdir -p "${S}"
+	cd "${S}"
+	gzip -dc "${DISTDIR}"/${A} | tar -xf - || return 1
+	S="${S}"/cmake-${PV}
+	cd "${S}"
+
+	einfo "Compiling ${A%-*}"
+	./bootstrap --prefix="${ROOT}"/tmp/usr || return 1
+	$MAKE ${MAKEOPTS} || return 1
+
+	einfo "Installing ${A%-*}"
+	$MAKE ${MAKEOPTS} install || return 1
+
+	einfo "${A%-*} bootstrapped"
+}
+
 bootstrap_zlib_core() {
 	# use 1.2.8 by default, current bootstrap guides
 	PV="${1:-1.2.8}"
@@ -1567,6 +1593,15 @@ bootstrap_stage1() {
 	# too vital to rely on a host-provided one
 	[[ -x ${ROOT}/tmp/usr/bin/python ]] || (bootstrap_python) || return 1
 
+	if [[ ! -e ${ROOT}/tmp/usr/bin/cmake ]] && [[ ${CHOST} == *-darwin* ]]
+	then
+		# TODO: make DARWIN_USE_GCC path also activated on ppc-macos,
+		# since it effectively is so
+		if [[ ${DARWIN_USE_GCC} != 1 && ${CHOST} != powerpc* ]] ; then
+			(bootstrap_cmake) || return 1
+		fi
+	fi
+
 	# checks itself if things need to be done still
 	(bootstrap_tree) || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c4d7697f3e19dd3a788e212d1ca0cbc57f4b0693
Author:     Jacob Floyd <cognifloyd <AT> gmail <DOT> com>
AuthorDate: Thu Dec 31 15:15:36 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 15:15:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c4d7697f

scripts/bootstrap-prefix: add gnuconfig to stage2 llvm deps

Newer llvm requires gnuconfig, so bootstrap it in stage2.

Bug: https://bugs.gentoo.org/758167

Signed-off-by: Jacob Floyd <cognifloyd <AT> gmail.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1943a3929b..c58ae8fcf1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -225,7 +225,7 @@ configure_toolchain() {
 			compiler_type="clang"
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
 			local mycc=
-			local llvm_deps="dev-util/ninja"
+			local llvm_deps="dev-util/ninja sys-devel/gnuconfig"
 			case "${ccvers}" in
 				*"Apple clang version "*)
 					vers=${ccvers#*Apple clang version }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f8d42d6fb3b9d7f4ce3b20ed016a9df7aa7fb91b
Author:     Jacob Floyd <cognifloyd <AT> gmail <DOT> com>
AuthorDate: Sat Dec 19 06:16:31 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 15:23:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f8d42d6f

Bootstrap with bash 5.1 instead of 5.1-rc3

Prefer releases over rc

Signed-off-by: Jacob Floyd <cognifloyd <AT> gmail.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c58ae8fcf1..5a73a87f8d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1385,7 +1385,7 @@ bootstrap_texinfo() {
 }
 
 bootstrap_bash() {
-	bootstrap_gnu bash 5.1-rc3 ||
+	bootstrap_gnu bash 5.1 ||
 	bootstrap_gnu bash 4.3 ||
 	bootstrap_gnu bash 4.2
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     597a517ce67de88f63ae156830d9708572b9f5b1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 17:27:12 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 17:27:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=597a517c

scripts/bootstrap-prefix: adjust LLVM hacks

- set PREROOTPATH for a version that is currently in tree
- drop obsolete hack for llvm-nm

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4394e131aa..fd8a343dae 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1974,7 +1974,7 @@ bootstrap_stage3() {
 		# (CBUILD, BDEPEND) and with the system being built
 		# (CHOST, RDEPEND).  To correctly bootstrap stage3,
 		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
-		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
+		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{12,11,10}/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
 		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
@@ -2140,13 +2140,6 @@ bootstrap_stage3() {
 	# now we have the compiler right there
 	unset CXX CPPFLAGS LDFLAGS
 
-	# On Darwin we have llvm-3.5 at this point, which provides nm.
-	# However for some reason this nm doesn't quite get it on newer
-	# platforms at least, resulting in bugs like #598336.  To cater for
-	# that, get rid of this nm and rely on the host one at this stage
-	[[ ${CHOST} == *-darwin* ]] && \
-		rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm
-
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 
 	# need special care, it depends on texinfo, #717786

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f7735b2d87b2e510098235c1cadc00a62818ddf5
Author:     Jacob Floyd <cognifloyd <AT> gmail <DOT> com>
AuthorDate: Thu Dec 31 17:49:04 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 17:49:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f7735b2d

scripts/bootstrap-prefix: properly deal with libcxx with clang

- libunwind is not available yet, and has more deps than we care to deal
  with, so just compile libcxx without libunwind in stage2 & stage3
- llvm and clang need to be built with the same libc++. If you don't
  build with the same libc++ then you get weird errors where comparing
  std::error_code's fails because llvm has one errc enum, and clang has
  a different one.

Bug: https://bugs.gentoo.org/758167
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fd8a343dae..8dae1b5944 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -234,10 +234,11 @@ configure_toolchain() {
 					mycc=clang
 					compiler_stage1+="
 						${llvm_deps}
+						sys-libs/libcxxabi
+						sys-libs/libcxx
 						sys-devel/llvm
 						sys-devel/clang
-						sys-libs/libcxxabi
-						sys-libs/libcxx"
+					"
 					CC=clang
 					CXX=clang++
 					# avoid going through hoops and deps for
@@ -262,10 +263,11 @@ configure_toolchain() {
 							mycc=clang
 							compiler_stage1+="
 								${llvm_deps}
+								sys-libs/libcxxabi
+								sys-libs/libcxx
 								sys-devel/llvm
 								sys-devel/clang
-								sys-libs/libcxxabi
-								sys-libs/libcxx"
+							"
 							;;
 					esac
 					CC=clang
@@ -289,10 +291,10 @@ configure_toolchain() {
 				local cdep="3.5.9999"
 				compiler_stage1+="
 					dev-libs/libffi
-					<sys-devel/llvm-${cdep}
 					<sys-libs/libcxx-headers-${cdep}
 					<sys-libs/libcxxabi-${cdep}
 					<sys-libs/libcxx-${cdep}
+					<sys-devel/llvm-${cdep}
 					<sys-devel/clang-${cdep}"
 			fi
 
@@ -541,6 +543,9 @@ bootstrap_setup() {
 	# Use package.use to disable in the portage tree to be shared between
 	# stage2 and stage3. The hack will be undone during tree sync in stage3.
 	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
+	# disable bootstrapping libcxx* with libunwind
+	sys-libs/libcxxabi -libunwind
+	sys-libs/libcxx -libunwind
 	# Most binary Linux distributions seem to fancy toolchains that
 	# do not do c++ support (need to install a separate package).
 	sys-libs/ncurses -cxx

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5d2345021f8f49961a32aafd42bee5cc18cddfb8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 17:24:14 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 17:24:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5d234502

scripts/bootstrap-prefix: adjust bootstrap_cmake for post stage1 usage

Like the ebuild, drop -isysroot usage, unfortunately we need to do this
post install, for cmake doesn't compile itself without it, yet libcxx
and friends don't compile with it.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5a73a87f8d..4394e131aa 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1213,13 +1213,30 @@ bootstrap_cmake() {
 	S="${S}"/cmake-${PV}
 	cd "${S}"
 
-	einfo "Compiling ${A%-*}"
+	# don't set a POSIX standard, system headers don't like that, #757426
+	sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+		Source/cmLoadCommandCommand.cxx \
+		Source/cmStandardLexer.h \
+		Source/cmSystemTools.cxx \
+		Source/cmTimestamp.cxx
+
+	einfo "Bootstrapping ${A%-*}"
 	./bootstrap --prefix="${ROOT}"/tmp/usr || return 1
+
+	einfo "Compiling ${A%-*}"
 	$MAKE ${MAKEOPTS} || return 1
 
 	einfo "Installing ${A%-*}"
 	$MAKE ${MAKEOPTS} install || return 1
 
+	# we need sysroot crap to build cmake itself, but it makes trouble
+	# lateron, so kill it in the installed version
+	sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+		"${EROOT}"/tmp/usr/share/cmake/Modules/Platform/Apple-GNU-*.cmake || die
+	# disable isysroot usage with clang as well
+	sed -i -e '/_SYSROOT_FLAG/d' \
+		"${EROOT}"/tmp/usr/share/cmake/Modules/Platform/Apple-Clang.cmake || die
+
 	einfo "${A%-*} bootstrapped"
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4e6bc8b4d40885216cef434386f30ab95f43ff53
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 18:36:04 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 18:36:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4e6bc8b4

scripts/bootstrap-prefix: drop obsolete Darwin code paths

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 66 ++-------------------------------------------
 1 file changed, 2 insertions(+), 64 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8dae1b5944..c383f0f11a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -224,14 +224,10 @@ configure_toolchain() {
 			compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
 			compiler_type="clang"
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
-			local mycc=
 			local llvm_deps="dev-util/ninja sys-devel/gnuconfig"
 			case "${ccvers}" in
-				*"Apple clang version "*)
-					vers=${ccvers#*Apple clang version }
-					vers=${vers% (clang-*}
+				*"Apple clang version "*|*"Apple LLVM version "*)
 					# this is Clang, recent enough to compile recent clang
-					mycc=clang
 					compiler_stage1+="
 						${llvm_deps}
 						sys-libs/libcxxabi
@@ -247,57 +243,12 @@ configure_toolchain() {
 					# from system set
 					linker=sys-devel/native-cctools
 					;;
-				*"Apple LLVM version "*)
-					vers=${ccvers#*Apple LLVM version }
-					vers=${vers% (clang-*}
-					# let's assume that >=llvm-3.6 is able to compile
-					# libcxx, so select the matching Apple versions, see
-					# https://gist.github.com/yamaya/2924292
-					case ${vers} in
-						[345]"."*|"6.0"*)
-							# bleh, old (<llvm-3.6)
-							mycc=gcc
-							;;
-						*)
-							# newish, try direct bootstrap to recent
-							mycc=clang
-							compiler_stage1+="
-								${llvm_deps}
-								sys-libs/libcxxabi
-								sys-libs/libcxx
-								sys-devel/llvm
-								sys-devel/clang
-							"
-							;;
-					esac
-					CC=clang
-					CXX=clang++
-					# see above for reasoning
-					linker=sys-devel/native-cctools
-					;;
 				*)
-					eerror "unknown compiler"
+					eerror "unknown/unsupported compiler"
 					return 1
 					;;
 			esac
 
-			if [[ ${mycc} == gcc ]] ; then
-				# The deps for 3.6+ are too high (cmake, ninja, python) so
-				# we have to install this with an intermediate
-				# unfortunately, gmp needs c++, thus libcxx, so have to drag
-				# it in early (gmp is necessary for >3.5)
-				# we always have to bootstrap with 3.4 for else we'd need
-				# libcxx, which only compiles with clang
-				local cdep="3.5.9999"
-				compiler_stage1+="
-					dev-libs/libffi
-					<sys-libs/libcxx-headers-${cdep}
-					<sys-libs/libcxxabi-${cdep}
-					<sys-libs/libcxx-${cdep}
-					<sys-devel/llvm-${cdep}
-					<sys-devel/clang-${cdep}"
-			fi
-
 			compiler="
 				sys-libs/csu
 				dev-libs/libffi
@@ -2121,19 +2072,6 @@ bootstrap_stage3() {
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python${PYTHONMAJMIN}/site-packages/clang
 
-	# llvm-3.5 doesn't find C++11 headers/lib by default, make it so
-	if [[ ${CHOST} == *-darwin9 ]] ; then
-		export OVERRIDE_CXXFLAGS="-I${ROOT}/tmp/usr/include/c++/v1 -fPIC"
-		# -fPIC is here because we need it, but the toolchain doesn't
-		# default to it (like for x86_64)
-		export OVERRIDE_CFLAGS="-fPIC"
-		# replace GCC's libstdc++ with libcxx (super hack!)
-		( cd "${ROOT}"/tmp/usr/lib/gcc/${CHOST}/4.2.1 \
-			&& ! test -e libstdc++.6.0.9.dylib-gcc \
-			&& mv libstdc++.6.0.9.dylib{,-gcc} \
-			&& ln -s ../../../libc++.1.dylib libstdc++.6.0.9.dylib )
-	fi
-
 	# try to get ourself out of the mudd, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto --disable-bootstrap')" \
 	GCC_MAKE_TARGET=$(rapx all) \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     83a59486061836d3d5d4866463811eacf31a477e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 20:30:16 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 20:30:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=83a59486

scripts/bootstrap-prefix: update default bootstrapped cmake a bit

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c383f0f11a..2de55682af 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1152,7 +1152,7 @@ bootstrap_python() {
 }
 
 bootstrap_cmake() {
-	PV=${1:-3.13.4}
+	PV=${1:-3.16.5}
 	A=cmake-${PV}.tar.gz
 
 	einfo "Bootstrapping ${A%-*}"
@@ -1187,11 +1187,12 @@ bootstrap_cmake() {
 
 	# we need sysroot crap to build cmake itself, but it makes trouble
 	# lateron, so kill it in the installed version
+	ver=${A%-*} ; ver=${ver%.*}
 	sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-		"${EROOT}"/tmp/usr/share/cmake/Modules/Platform/Apple-GNU-*.cmake || die
+		"${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-GNU-*.cmake || die
 	# disable isysroot usage with clang as well
 	sed -i -e '/_SYSROOT_FLAG/d' \
-		"${EROOT}"/tmp/usr/share/cmake/Modules/Platform/Apple-Clang.cmake || die
+		"${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-Clang.cmake || die
 
 	einfo "${A%-*} bootstrapped"
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0a3b74f39934e6ed3c46a48096205880818bdb94
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 12:33:43 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 12:33:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0a3b74f3

scripts/bootstrap-prefix: install gnuconfig first thing

this is in particular useful on arm64-macos where the CHOST triple isn't
known, but won't hurt for other targets

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2de55682af..ea77baae8d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -224,7 +224,7 @@ configure_toolchain() {
 			compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
 			compiler_type="clang"
 			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
-			local llvm_deps="dev-util/ninja sys-devel/gnuconfig"
+			local llvm_deps="dev-util/ninja"
 			case "${ccvers}" in
 				*"Apple clang version "*|*"Apple LLVM version "*)
 					# this is Clang, recent enough to compile recent clang
@@ -1779,6 +1779,7 @@ bootstrap_stage2() {
 
 	# Build a basic compiler and portage dependencies in $ROOT/tmp.
 	pkgs=(
+		sys-devel/gnuconfig
 		sys-apps/gentoo-functions
 		app-portage/elt-patches
 		$([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c6178609ad13ed5b427b2caba8eeece057e775b5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 12:34:43 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 12:34:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c6178609

scripts/bootstrap-prefix: only set -isysroot in stage3 with GCC

Clang gets utterly confused on this, so avoid it.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ea77baae8d..8d1260c558 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1915,7 +1915,8 @@ bootstrap_stage3() {
 	}
 
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
-	export CPPFLAGS="-isystem ${ROOT}/usr/include"
+	[[ ${compiler_type} == gcc ]] && \
+		export CPPFLAGS="-isystem ${ROOT}/usr/include"
 	export LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
 	[[ ${CHOST} == *-darwin* ]] || \
 		LDFLAGS+=" -Wl,-rpath=${ROOT}/usr/$(get_libdir)"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     84ecb26582afcba8f260ae2d00c3235810ced7b7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 10:36:21 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 10:36:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=84ecb265

scripts/bootstrap-prefix: use emake wrapper for unified behaviour

emake uses v() to log what it does (consistently) and applies $MAKEOPTS

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8d1260c558..b9f225be71 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -31,6 +31,10 @@ econf() {
 		"$@" || return 1
 }
 
+emake() {
+	v $MAKE ${MAKEOPTS} "$@" || return 1
+}
+
 efetch() {
 	if [[ ! -e ${DISTDIR}/${1##*/} ]] ; then
 	  	if [[ ${OFFLINE_MODE} ]]; then
@@ -680,10 +684,10 @@ bootstrap_portage() {
 		--with-portage-group="`id -gn`" \
 		--with-extra-path="${PATH}" \
 		|| return 1
-	$MAKE ${MAKEOPTS} || return 1
+	emake || return 1
 
  	einfo "Installing ${A%-*}"
-	$MAKE install || return 1
+	emake install || return 1
 
 	cd "${ROOT}"
 	rm -Rf ${ptmp} >& /dev/null
@@ -759,10 +763,10 @@ bootstrap_simple() {
 	if [[ -x configure ]] ; then
 		econf ${myconf} || return 1
 	fi
-	v $MAKE || return 1
+	emake || return 1
 
 	einfo "Installing ${A%-*}"
-	v $MAKE PREFIX="${ROOT}"/tmp/usr install || return 1
+	emake PREFIX="${ROOT}"/tmp/usr install || return 1
 
 	cd "${ROOT}"
 	rm -Rf "${S}"
@@ -963,14 +967,14 @@ bootstrap_gnu() {
 	if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then
 		v ./build.sh || return 1
 	else
-		v $MAKE ${MAKEOPTS} || return 1
+		emake || return 1
 	fi
 
 	einfo "Installing ${PN}"
 	if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then
 		v ./make install MAKE="${S}/make" || return 1
 	else
-		v $MAKE install || return 1
+		emake install || return 1
 	fi
 
 	cd "${ROOT}"
@@ -1137,10 +1141,10 @@ bootstrap_python() {
 		--disable-shared \
 		--libdir="${ROOT}"/tmp/usr/lib \
 		${myconf} || return 1
-	$MAKE ${MAKEOPTS} || return 1
+	emake || return 1
 
 	einfo "Installing ${A%-*}"
-	$MAKE -k install || echo "??? Python failed to install *sigh* continuing anyway"
+	emake -k install || echo "??? Python failed to install *sigh* continuing anyway"
 	cd "${ROOT}"/tmp/usr/bin
 	ln -sf python${PV%.*} python
 	cd "${ROOT}"/tmp/usr/lib
@@ -1180,10 +1184,10 @@ bootstrap_cmake() {
 	./bootstrap --prefix="${ROOT}"/tmp/usr || return 1
 
 	einfo "Compiling ${A%-*}"
-	$MAKE ${MAKEOPTS} || return 1
+	emake || return 1
 
 	einfo "Installing ${A%-*}"
-	$MAKE ${MAKEOPTS} install || return 1
+	emake install || return 1
 
 	# we need sysroot crap to build cmake itself, but it makes trouble
 	# lateron, so kill it in the installed version
@@ -1256,10 +1260,11 @@ bootstrap_zlib_core() {
 
 	einfo "Compiling ${A%-*}"
 	CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return 1
-	$MAKE "${makeopts[@]}" || return 1
+	MAKEOPTS=
+	emake "${makeopts[@]}" || return 1
 
 	einfo "Installing ${A%-*}"
-	$MAKE "${makeopts[@]}" -j1 install || return 1
+	emake "${makeopts[@]}" -j1 install || return 1
 
 	# this lib causes issues when emerging python again on Solaris
 	# because the tmp lib path is in the library search path there

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     94efbc6a0e731f2d6eab66ed4cbcceb46514f34c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 10:46:08 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 10:46:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=94efbc6a

scripts/bootstrap-prefix: drop obsolete target stuff

mostly AIX, Interix and IRIX bits, also drop obsoleted Solaris and
Darwin versions bits

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 122 +++-----------------------------------------
 1 file changed, 7 insertions(+), 115 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b9f225be71..d453ef7e35 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -102,16 +102,10 @@ configure_cflags() {
 		*-darwin*)
 			export LDFLAGS="-Wl,-search_paths_first -L${ROOT}/tmp/usr/lib"
 			;;
-		*-solaris* | *-irix*)
+		*-solaris*)
 			export LDFLAGS="-L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib"
 			;;
-		*-*-aix*)
-			# The bootstrap compiler unlikely has runtime linking
-			# enabled already, but elibtoolize switches to the
-			# "lib.so(shr.o)" sharedlib variant.
-			export LDFLAGS="-Wl,-brtl -L${ROOT}/tmp/usr/lib"
-			;;
-		i586-pc-interix* | i586-pc-winnt* | *-pc-cygwin*)
+		i586-pc-winnt* | *-pc-cygwin*)
 			export LDFLAGS="-L${ROOT}/tmp/usr/lib"
 			;;
 		*)
@@ -283,9 +277,6 @@ configure_toolchain() {
 				*)            export NM="$(type -P nm) -p" ;;  # Solaris nm
 			esac
 			;;
-		*-*-aix*)
-			linker=sys-devel/native-cctools
-			;;
 	esac
 }
 
@@ -353,26 +344,15 @@ bootstrap_setup() {
 	fi
 
 	case ${CHOST} in
-		powerpc-apple-darwin7)
-			profile="prefix/darwin/macos/10.3"
-			;;
-		powerpc-apple-darwin[89])
+		powerpc-apple-darwin9)
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/ppc"
 			;;
-		powerpc64-apple-darwin[89])
-			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/10.$((rev - 4))/ppc64"
-			;;
-		i*86-apple-darwin[89])
-			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
-			;;
-		i*86-apple-darwin1[012345678])
+		i*86-apple-darwin1[578])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
-		x86_64-apple-darwin9|x86_64-apple-darwin1[0123456789])
+		x86_64-apple-darwin1[5789])
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
@@ -392,9 +372,6 @@ bootstrap_setup() {
 			profile=${profile_linux/ARCH/amd64}
 			profile=${profile/17.0/17.1/no-multilib}
 			;;
-		ia64-pc-linux-gnu)
-			profile=${profile_linux/ARCH/ia64}
-			;;
 		powerpc-unknown-linux-gnu)
 			profile=${profile_linux/ARCH/ppc}
 			;;
@@ -410,24 +387,6 @@ bootstrap_setup() {
 		armv7l-pc-linux-gnu)
 			profile=${profile_linux/ARCH/arm}
 			;;
-		sparc-sun-solaris2.9)
-			profile="prefix/sunos/solaris/5.9/sparc"
-			;;
-		sparcv9-sun-solaris2.9)
-			profile="prefix/sunos/solaris/5.9/sparc64"
-			;;
-		i386-pc-solaris2.10)
-			profile="prefix/sunos/solaris/5.10/x86"
-			;;
-		x86_64-pc-solaris2.10)
-			profile="prefix/sunos/solaris/5.10/x64"
-			;;
-		sparc-sun-solaris2.10)
-			profile="prefix/sunos/solaris/5.10/sparc"
-			;;
-		sparcv9-sun-solaris2.10)
-			profile="prefix/sunos/solaris/5.10/sparc64"
-			;;
 		i386-pc-solaris2.11)
 			profile="prefix/sunos/solaris/5.11/x86"
 			;;
@@ -440,18 +399,9 @@ bootstrap_setup() {
 		sparcv9-sun-solaris2.11)
 			profile="prefix/sunos/solaris/5.11/sparc64"
 			;;
-		powerpc-ibm-aix*)
-			profile="prefix/aix/${CHOST#powerpc-ibm-aix}/ppc"
-			;;
-		i586-pc-interix*)
-			profile="prefix/windows/interix/${CHOST#i586-pc-interix}/x86"
-			;;
 		i586-pc-winnt*)
 			profile="prefix/windows/winnt/${CHOST#i586-pc-winnt}/x86"
 			;;
-		i686-pc-cygwin*)
-			profile="prefix/windows/cygwin/x86"
-			;;
 		x86_64-pc-cygwin*)
 			profile="prefix/windows/cygwin/x64"
 			;;
@@ -885,19 +835,8 @@ bootstrap_gnu() {
 		# Solaris 11 has a messed up prce installation.  We don't need
 		# it anyway, so just disable it
 		myconf="${myconf} --disable-perl-regexp"
-		# Except interix really needs it for grep.
-		[[ $CHOST == *interix* ]] && myconf="${myconf} --disable-nls"
-	fi
-
-	# AIX doesn't like --enable-nls in general during bootstrap
-	[[ $CHOST == *-aix* ]] && myconf="${myconf} --disable-nls"
-	# AIX 7.1 has fstatat(), but broken without APAR IV23716:
-	[[ $CHOST == *-aix7* ]] && export ac_cv_func_fstatat=no
-	# AIX lacks /dev/fd/*, bash uses (blocking) named pipes instead
-	[[ ${PN} == "bash" ]] && sed -i -e 's/|O_NONBLOCK//' subst.c
-	# but portage's multijob needs more unique pipe names
-	[[ ${PN},${CHOST} == bash,*-aix* ]] &&
-	export CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-DUSE_MKTEMP"
+	fi
+
 	# pod2man may be too old (not understanding --utf8) but we don't
 	# care about manpages at this stage
 	export ac_cv_path_POD2MAN=no
@@ -1075,11 +1014,6 @@ bootstrap_python() {
 	esac
 
 	case $CHOST in
-		*-*-aix*)
-			# Python stubbornly insists on using cc_r to compile.  We
-			# know better, so force it to listen to us
-			myconf="${myconf} --with-gcc=yes"
-		;;
 		*-*-cygwin*)
 			# --disable-shared would link modules against "python.exe"
 			# so renaming to "pythonX.Y.exe" will break them.
@@ -1274,14 +1208,6 @@ bootstrap_zlib_core() {
 		rm -Rf "${x}"
 	done
 
-	if [[ ${CHOST} == *-aix* ]]; then
-		# No aix-soname support, but symlinks when built with gcc. This breaks
-		# later on when aix-soname is added within Prefix, where the lib.so.1
-		# is an archive then, while finding this one first due to possible
-		# rpath ordering issues.
-		rm -f "${ROOT}"/tmp/usr/lib/libz.so.1
-	fi
-
 	einfo "${A%-*} bootstrapped"
 }
 
@@ -1497,16 +1423,6 @@ bootstrap_stage1() {
 	# be identified as stage1-installed like in bug #615410.
 	mkdir -p "${ROOT}"/tmp/usr/local/bin
 	case ${CHOST} in
-		*-*-aix*)
-			# sys-devel/native-cctools installs the wrapper below,
-			# but we need it early or gmp breaks
-			{
-				echo '#!/bin/sh'
-				echo 'test ${#TMPDIR} -le 85 || TMPDIR=/tmp export TMPDIR'
-				echo 'exec /usr/ccs/bin/nm ${1+"$@"}'
-			} > "${ROOT}"/tmp/usr/local/bin/nm
-			chmod 755 "${ROOT}"/tmp/usr/local/bin/nm
-			;;
 		*-darwin*)
 			# Recent Mac OS X have a nice popup to install java when
 			# it's called without being installed, this doesn't stop the
@@ -1787,7 +1703,6 @@ bootstrap_stage2() {
 		sys-devel/gnuconfig
 		sys-apps/gentoo-functions
 		app-portage/elt-patches
-		$([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency
 		$([[ ${CHOST} == *-cygwin* ]] && echo dev-libs/libiconv ) # bash dependency
 		sys-libs/ncurses
 		sys-libs/readline
@@ -2573,7 +2488,6 @@ EOF
 		*-freebsd*)    ncpu=$(/sbin/sysctl -n hw.ncpu)                     ;;
 		*-solaris*)    ncpu=$(/usr/sbin/psrinfo | wc -l)                   ;;
 		*-linux-gnu*)  ncpu=$(cat /proc/cpuinfo | grep processor | wc -l)  ;;
-		*-aix*)        ncpu=$(/usr/sbin/bindprocessor -q | cut -d: -f2 | wc -w) ;;
 		*)             ncpu=1                                              ;;
 	esac
 	# get rid of excess spaces (at least Solaris wc does)
@@ -3088,20 +3002,6 @@ if [[ -z ${CHOST} ]]; then
 					;;
 				esac
 				;;
-			AIX)
-				# GNU coreutils uname sucks, it doesn't know what
-				# processor it is using on AIX.  We mimick GNU CHOST
-				# guessing here, instead of what IBM uses itself.
-				CHOST="`/usr/bin/uname -p`-ibm-aix`oslevel`"
-				;;
-			Interix)
-				case `uname -m` in
-					x86) CHOST="i586-pc-interix`uname -r`" ;;
-					*) eerror "Can't deal with interix `uname -m` (yet)"
-					   exit 1
-					;;
-				esac
-				;;
 			CYGWIN*)
 				CHOST="`uname -m`-pc-cygwin"
 				;;
@@ -3133,14 +3033,6 @@ case ${CHOST} in
 			MAKE=make
 		fi
 	;;
-	*-sgi-irix*)
-		MAKE=gmake
-	;;
-	*-aix*)
-		MAKE=make
-		# We do run in bash here, no? It is ways faster than /bin/sh.
-		: ${CONFIG_SHELL:=${BASH}}
-		;;
 	*)
 		MAKE=make
 	;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     03b9c49ec4aa5dce0d8d4a3666a90d8f720c728b
Author:     Jacob Floyd <cognifloyd <AT> gmail <DOT> com>
AuthorDate: Sat Jan  2 10:51:38 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 10:51:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=03b9c49e

scripts/bootstrap-prefix: fix typo

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d453ef7e35..268c0d3b54 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2809,7 +2809,7 @@ EOF
 	export CHOST=$(portageq envvar CHOST)
 
 	# after stage1 and stage2 we should have a bash of our own, which
-	# is preferably over the host-provided one, because we know it can
+	# is preferable over the host-provided one, because we know it can
 	# deal with the bash-constructs we use in stage3 and onwards
 	hash -r
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0ccebdced152a77a504c3ba97735181a5a99d365
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 10:59:37 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 10:59:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0ccebdce

scripts/bootstrap-prefix: consistently report versions in stage1 compiles

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 62 ++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 268c0d3b54..baa314a240 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -592,11 +592,11 @@ bootstrap_portage() {
 	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.12"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
-	einfo "Bootstrapping ${A%-*}"
+	einfo "Bootstrapping ${A%.tar.*}"
 		
 	efetch ${DISTFILES_URL}/${A} || return 1
 
-	einfo "Unpacking ${A%-*}"
+	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}"/portage-${PV}
 	ptmp=${S}
 	rm -rf "${S}" >& /dev/null
@@ -627,7 +627,7 @@ bootstrap_portage() {
 	[[ -x ${ROOT}/tmp/bin/sh ]] || ln -s bash "${ROOT}"/tmp/bin/sh || return 1
 	export PORTAGE_BASH="${ROOT}"/tmp/bin/bash
 
-	einfo "Compiling ${A%-*}"
+	einfo "Compiling ${A%.tar.*}"
 	econf \
 		--with-offset-prefix="${ROOT}"/tmp \
 		--with-portage-user="`id -un`" \
@@ -636,7 +636,7 @@ bootstrap_portage() {
 		|| return 1
 	emake || return 1
 
- 	einfo "Installing ${A%-*}"
+	einfo "Installing ${A%.tar.*}"
 	emake install || return 1
 
 	cd "${ROOT}"
@@ -661,7 +661,7 @@ bootstrap_portage() {
 		sed -i -e "s,gentoo_prefix,$(<"${PORTDIR}"/profiles/repo_name)," "${ROOT}"/tmp/usr/share/portage/config/repos.conf || return 1
 	fi
 
-	einfo "${A%-*} successfully bootstrapped"
+	einfo "${A%.tar.*} successfully bootstrapped"
 }
 
 fix_config_sub() {
@@ -683,11 +683,11 @@ bootstrap_simple() {
 	PN=$1
 	PV=$2
 	A=${PN}-${PV}.tar.${3:-gz}
-	einfo "Bootstrapping ${A%-*}"
+	einfo "Bootstrapping ${A%.tar.*}"
 
 	efetch ${4:-${DISTFILES_G_O}/distfiles}/${A} || return 1
 
-	einfo "Unpacking ${A%-*}"
+	einfo "Unpacking ${A%.tar.*}"
 	S="${PORTAGE_TMPDIR}/${PN}-${PV}"
 	rm -rf "${S}"
 	mkdir -p "${S}"
@@ -709,18 +709,18 @@ bootstrap_simple() {
 		myconf="${myconf} --enable-static --disable-shared"
 	fi
 
-	einfo "Compiling ${A%-*}"
+	einfo "Compiling ${A%.tar.*}"
 	if [[ -x configure ]] ; then
 		econf ${myconf} || return 1
 	fi
 	emake || return 1
 
-	einfo "Installing ${A%-*}"
+	einfo "Installing ${A%.tar.*}"
 	emake PREFIX="${ROOT}"/tmp/usr install || return 1
 
 	cd "${ROOT}"
 	rm -Rf "${S}"
-	einfo "${PN}-${PV} successfully bootstrapped"
+	einfo "${A%.tar.*} successfully bootstrapped"
 }
 
 bootstrap_gnu() {
@@ -728,7 +728,7 @@ bootstrap_gnu() {
 	PN=$1
 	PV=$2
 
-	einfo "Bootstrapping ${PN}"
+	einfo "Bootstrapping ${A%.tar.*}"
 
 	for t in tar.xz tar.bz2 tar.gz tar ; do
 		A=${PN}-${PV}.${t}
@@ -747,7 +747,7 @@ bootstrap_gnu() {
 		URL=${GNU_URL}/${PN}/${A}
 		efetch ${URL} || continue
 
-		einfo "Unpacking ${A%-*}"
+		einfo "Unpacking ${A%.tar.*}"
 		S="${PORTAGE_TMPDIR}/${PN}-${PV}"
 		rm -rf "${S}"
 		mkdir -p "${S}"
@@ -901,7 +901,7 @@ bootstrap_gnu() {
 		esac
 	fi
 
-	einfo "Compiling ${PN}"
+	einfo "Compiling ${A%.tar.*}"
 	econf ${myconf} || return 1
 	if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then
 		v ./build.sh || return 1
@@ -909,7 +909,7 @@ bootstrap_gnu() {
 		emake || return 1
 	fi
 
-	einfo "Installing ${PN}"
+	einfo "Installing ${A%.tar.*}"
 	if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then
 		v ./make install MAKE="${S}/make" || return 1
 	else
@@ -918,20 +918,20 @@ bootstrap_gnu() {
 
 	cd "${ROOT}"
 	rm -Rf "${S}"
-	einfo "${PN}-${PV} successfully bootstrapped"
+	einfo "${A%.tar.*} successfully bootstrapped"
 }
 
 PYTHONMAJMIN=3.8   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
 	PV=3.8.6
 	A=Python-${PV}.tar.xz
-	einfo "Bootstrapping ${A%-*}"
+	einfo "Bootstrapping ${A%.tar.*}"
 
 	# don't really want to put this on the mirror, since they are
 	# non-vanilla sources, bit specific for us
 	efetch ${DISTFILES_URL}/${A} || return 1
 
-	einfo "Unpacking ${A%%-*}"
+	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/python-${PV}"
 	rm -rf "${S}"
 	mkdir -p "${S}"
@@ -1061,7 +1061,7 @@ bootstrap_python() {
 	export PYTHON_DISABLE_MODULES="_bsddb bsddb bsddb185 bz2 crypt _ctypes_test _curses _curses_panel dbm _elementtree gdbm _locale nis pyexpat readline _sqlite3 _tkinter"
 	export OPT="${CFLAGS}"
 
-	einfo "Compiling ${A%-*}"
+	einfo "Compiling ${A%.tar.*}"
 
 	# some ancient versions of hg fail with "hg id -i", so help
 	# configure to not find them using HAS_HG
@@ -1077,7 +1077,7 @@ bootstrap_python() {
 		${myconf} || return 1
 	emake || return 1
 
-	einfo "Installing ${A%-*}"
+	einfo "Installing ${A%.tar.*}"
 	emake -k install || echo "??? Python failed to install *sigh* continuing anyway"
 	cd "${ROOT}"/tmp/usr/bin
 	ln -sf python${PV%.*} python
@@ -1086,19 +1086,19 @@ bootstrap_python() {
 	# http://forums.gentoo.org/viewtopic-p-6890526.html
 	rm -f libpython${PV%.*}.a
 
-	einfo "${A%-*} bootstrapped"
+	einfo "${A%.tar.*} bootstrapped"
 }
 
 bootstrap_cmake() {
 	PV=${1:-3.16.5}
 	A=cmake-${PV}.tar.gz
 
-	einfo "Bootstrapping ${A%-*}"
+	einfo "Bootstrapping ${A%.tar.*}"
 
 	efetch https://github.com/Kitware/CMake/releases/download/v${PV}/${A} \
 		|| return 1
 
-	einfo "Unpacking ${A%%-*}"
+	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/cmake-${PV}"
 	rm -rf "${S}"
 	mkdir -p "${S}"
@@ -1114,13 +1114,13 @@ bootstrap_cmake() {
 		Source/cmSystemTools.cxx \
 		Source/cmTimestamp.cxx
 
-	einfo "Bootstrapping ${A%-*}"
+	einfo "Bootstrapping ${A%.tar.*}"
 	./bootstrap --prefix="${ROOT}"/tmp/usr || return 1
 
-	einfo "Compiling ${A%-*}"
+	einfo "Compiling ${A%.tar.*}"
 	emake || return 1
 
-	einfo "Installing ${A%-*}"
+	einfo "Installing ${A%.tar.*}"
 	emake install || return 1
 
 	# we need sysroot crap to build cmake itself, but it makes trouble
@@ -1132,7 +1132,7 @@ bootstrap_cmake() {
 	sed -i -e '/_SYSROOT_FLAG/d' \
 		"${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-Clang.cmake || die
 
-	einfo "${A%-*} bootstrapped"
+	einfo "${A%.tar.*} bootstrapped"
 }
 
 bootstrap_zlib_core() {
@@ -1140,11 +1140,11 @@ bootstrap_zlib_core() {
 	PV="${1:-1.2.8}"
 	A=zlib-${PV}.tar.gz
 
-	einfo "Bootstrapping ${A%-*}"
+	einfo "Bootstrapping ${A%.tar.*}"
 
 	efetch ${DISTFILES_G_O}/distfiles/${A} || return 1
 
-	einfo "Unpacking ${A%%-*}"
+	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/zlib-${PV}"
 	rm -rf "${S}"
 	mkdir -p "${S}"
@@ -1192,12 +1192,12 @@ bootstrap_zlib_core() {
 		ln -sf libz.dll.a "${ROOT}"/tmp/usr/lib/libz.dll
 	fi
 
-	einfo "Compiling ${A%-*}"
+	einfo "Compiling ${A%.tar.*}"
 	CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return 1
 	MAKEOPTS=
 	emake "${makeopts[@]}" || return 1
 
-	einfo "Installing ${A%-*}"
+	einfo "Installing ${A%.tar.*}"
 	emake "${makeopts[@]}" -j1 install || return 1
 
 	# this lib causes issues when emerging python again on Solaris
@@ -1208,7 +1208,7 @@ bootstrap_zlib_core() {
 		rm -Rf "${x}"
 	done
 
-	einfo "${A%-*} bootstrapped"
+	einfo "${A%.tar.*} bootstrapped"
 }
 
 bootstrap_zlib() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     bf1e800265bf02baadebb668db736e39d6dde6d8
Author:     Jacob Floyd <cognifloyd <AT> gmail <DOT> com>
AuthorDate: Sat Jan  2 11:01:26 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 11:01:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bf1e8002

scripts/bootstrap-prefix: print package list during emerge -e system

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index baa314a240..e5bcff41a6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2889,11 +2889,11 @@ EOF
 
 	[[ ${STOP_BOOTSTRAP_AFTER} == stage3 ]] && exit 0
 
-	local cmd="emerge -e system"
+	local cmd="emerge -v -e system"
 	if [[ -e ${EPREFIX}/var/cache/edb/mtimedb ]] && \
 		grep -q resume "${EPREFIX}"/var/cache/edb/mtimedb ;
 	then
-		cmd="emerge --resume"
+		cmd="emerge -v --resume"
 	fi
 	einfo "running ${cmd}"
 	if ${cmd} ; then

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     9fcb6ef5e9520ac812f28feae6044a9b79712ecf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 11:33:48 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 11:33:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9fcb6ef5

scripts/bootstrap-prefix: show bootstrap status in terminal window title

This really is unnecessary candy,
but I like something sweet during the long wait.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e5bcff41a6..82b8693832 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3,22 +3,26 @@
 
 trap 'exit 1' TERM KILL INT QUIT ABRT
 
-# some basic output functions
-eerror() { echo "!!! $*" 1>&2; }
-einfo() { echo "* $*"; }
-
 # RAP (libc) mode is triggered on Linux kernel and glibc.
 is-rap() { [[ ${PREFIX_DISABLE_RAP} != "yes" && ${CHOST} = *linux-gnu* ]]; }
 rapx() { is-rap && echo $1 || echo $2; }
 
 ## Functions Start Here
 
-v() {
-	echo "$@"
-	"$@"
+estatus() {
+	# this can give some garbage in the logs, but it shouldn't be too
+	# disturbing -- if it works, it makes it easy to see where we are in
+	# the bootstrap from the terminal status line (usually the window
+	# name)
+	printf '\033]2;'"$*"'\007'
 }
 
+eerror() { estatus $*; echo "!!! $*" 1>&2; }
+einfo() { echo "* $*"; }
+v() { echo "$@"; "$@"; }
+
 econf() {
+	estatus "stage1: configuring ${PWD##*/}"
 	v ${CONFIG_SHELL} ./configure \
 		--host=${CHOST} \
 		--prefix="${ROOT}"/tmp/usr \
@@ -32,6 +36,9 @@ econf() {
 }
 
 emake() {
+	[[ $* == *install* ]] \
+		&& estatus "stage1: installing ${PWD##*/}" \
+		|| estatus "stage1: building ${PWD##*/}"
 	v $MAKE ${MAKEOPTS} "$@" || return 1
 }
 
@@ -41,7 +48,7 @@ efetch() {
 		  echo "I need ${1##*/} from $1 in $DISTDIR, can you give it to me?"
 		  read
 		  [[ -e ${DISTDIR}/${1##*/} ]] && return 0
-		  #Give fetch a try 
+		  # Give fetch a try
 		fi
 
 		if [[ -z ${FETCH_COMMAND} ]] ; then
@@ -69,6 +76,7 @@ efetch() {
 
 		mkdir -p "${DISTDIR}" >& /dev/null
 		einfo "Fetching ${1##*/}"
+		estatus "stage1: fetching ${1##*/}"
 		pushd "${DISTDIR}" > /dev/null
 
 		# try for mirrors first, fall back to distfiles, then try given location
@@ -513,6 +521,7 @@ do_tree() {
 		fi
 		[[ -e ${PORTDIR} ]] || mkdir -p ${PORTDIR}
 		einfo "Unpacking, this may take a while"
+		estatus "stage1: unpacking Portage tree"
 		bzip2 -dc ${DISTDIR}/$2 | \
 			tar -xf - -C ${PORTDIR} --strip-components=1 || return 1
 		touch ${PORTDIR}/.unpacked
@@ -530,6 +539,7 @@ bootstrap_tree() {
 	fi
 	local ret=$?
 	if [[ -n ${TREE_FROM_SRC} ]]; then
+		estatus "stage1: rsyncing Portage tree"
 		rsync -av --delete \
 			--exclude=.unpacked \
 			--exclude=distfiles \
@@ -904,6 +914,7 @@ bootstrap_gnu() {
 	einfo "Compiling ${A%.tar.*}"
 	econf ${myconf} || return 1
 	if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then
+		estatus "stage1: building ${A%.tar.*}"
 		v ./build.sh || return 1
 	else
 		emake || return 1
@@ -911,6 +922,7 @@ bootstrap_gnu() {
 
 	einfo "Installing ${A%.tar.*}"
 	if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then
+		estatus "stage1: installing ${A%.tar.*}"
 		v ./make install MAKE="${S}/make" || return 1
 	else
 		emake install || return 1
@@ -1115,6 +1127,7 @@ bootstrap_cmake() {
 		Source/cmTimestamp.cxx
 
 	einfo "Bootstrapping ${A%.tar.*}"
+	estatus "stage1: configuring ${A%.tar.*}"
 	./bootstrap --prefix="${ROOT}"/tmp/usr || return 1
 
 	einfo "Compiling ${A%.tar.*}"
@@ -1509,6 +1522,7 @@ bootstrap_stage1() {
 	[[ -e ${ROOT}/tmp/usr/bin/emerge ]] || (bootstrap_portage) || return 1
 	prepare_portage
 
+	estatus "stage1 finished"
 	einfo "stage1 successfully finished"
 }
 
@@ -1598,6 +1612,7 @@ do_emerge_pkgs() {
 		# defaults).
 		echo "USE=${myuse[*]} PKG=${pkg}"
 		(
+			estatus "${STAGE}: emerge ${pkg}"
 			unset CFLAGS CXXFLAGS
 			[[ -n ${OVERRIDE_CFLAGS} ]] \
 				&& export CFLAGS=${OVERRIDE_CFLAGS}
@@ -1640,6 +1655,7 @@ bootstrap_stage2() {
 
 	emerge_pkgs() {
 		EPREFIX="${ROOT}"/tmp \
+		STAGE=stage2 \
 		do_emerge_pkgs "$@"
 	}
 
@@ -1789,6 +1805,7 @@ bootstrap_stage2() {
 		cp "${ROOT}"/tmp/usr/${CHOST}/lib/gcc/* "${ROOT}"/usr/${CHOST}/lib/gcc
 	fi
 
+	estatus "stage2 finished"
 	einfo "stage2 successfully finished"
 }
 
@@ -1857,6 +1874,7 @@ bootstrap_stage3() {
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
 		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
+		STAGE=stage3 \
 		do_emerge_pkgs "$@"
 	}
 
@@ -1954,8 +1972,8 @@ bootstrap_stage3() {
 
 		# avoid circular deps with sys-libs/pam, bug#712020
 		pkgs=(
-				sys-apps/attr
-				sys-libs/libcap
+			sys-apps/attr
+			sys-libs/libcap
 		)
 		BOOTSTRAP_RAP=yes \
 		USE="${USE} -pam" \
@@ -2063,6 +2081,7 @@ bootstrap_stage3() {
 	hash -r
 
 	# Update the portage tree.
+	estatus "stage3: updating Portage tree"
 	treedate=$(date -f "${PORTDIR}"/metadata/timestamp +%s)
 	nowdate=$(date +%s)
 	[[ ( ! -e ${PORTDIR}/.unpacked ) && \
@@ -2094,6 +2113,7 @@ bootstrap_stage3() {
 	# (--depclean may fail, which is ok)
 	sed -i -e 's/resume/cleared/' "${ROOT}"/var/cache/edb/mtimedb
 
+	estatus "stage3 finished"
 	einfo "stage3 successfully finished"
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c0ff0e5d25b78f612b26b63d0da31c69f6a034d4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 19:16:31 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 19:16:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c0ff0e5d

scripts: remove old/obsolete scripts

- eupdate: dead the moment gx86 was migrated to git
- keyword-check: I frankly don't recall what it is/was for

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/eupdate.in       | 831 -----------------------------------------------
 scripts/keyword-check.rb |  51 ---
 2 files changed, 882 deletions(-)

diff --git a/scripts/eupdate.in b/scripts/eupdate.in
deleted file mode 100755
index 1726cbec7d..0000000000
--- a/scripts/eupdate.in
+++ /dev/null
@@ -1,831 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2006-2014 Gentoo Foundation; Distributed under the GPL v2
-
-# <haubi@gentoo.org> -- 2014-08-04
-# do numeric comparison on calculated rev-diff, as [[ 0 < -9 ]] is true
-# <grobian@gentoo.org> -- 2010-10-16
-# treat ChangeLogs special, such that newer repoman that update the
-# ChangeLog can just do so -- we try to 'prepend only' avoiding
-# conflicts
-# <abcd@gentoo.org> -- 2010-01-14
-# allow eclasses to be found in MTREEDIR if not in PTREEDIR
-# <zuxez@cs.tu-berlin.de> -- 2009-08-11
-# allow to use web-based viewcvs instead of anonymous CVS access
-# <grobian@gentoo.org> -- 2008-06-17
-# switch to fully sourcing ebuilds (and their eclasses) in fetch_files
-# such that we catch more cases in which patches can be referenced
-# <grobian@gentoo.org> -- 2007-11-27
-# ignore live CVS ebuilds (version 9999)
-# <grobian@gentoo.org> -- 2007-11-11
-# add some dummy implementations of often used functions to silence bash
-# some more
-# <grobian@gentoo.org> -- 2007-11-09
-# also take notion of local variables for expansion in fetch_files
-# <grobian@gentoo.org> -- 2007-10-08
-# added support for _p in versions after _rc, _pre, etc.
-# sourcing the versionator eclass when being used now for better
-# expansion of variables in fetch_files
-# <grobian@gentoo.org> -- 2007-09-24
-# added support for all P* variables in fetch_files expansion, avoided
-# getting bash errors due to unterminated quotes
-# <grobian@gentoo.org> -- 2007-09-12
-# performance improvements by avoiding comparing ebuilds to non-ebuilds
-# when looking for updates, and by avoiding fork/execs for cut and echo
-# in the version comparator function
-# <grobian@gentoo.org> -- 2007-03-20
-# also update alpha, beta, pre, p, etc. instead of only revisions.
-# Basically everything which is on top of the 'base' version number
-# should be upgraded always.
-# <grobian@gentoo.org> -- 2007-02-08
-# when adding a new version, also try and copy all extra files from
-# FILESDIR.  Also when invoked from an empty directory properly deal
-# with "missing" files, so new files are copied.
-# <grobian@gentoo.org> -- 2006-12-24
-# support for inter-revisions (-r01.1), which are also ignored when
-# comparing to the main tree
-# <grobian@gentoo.org> -- 2006-11-03
-# let eapify figure out what should be done to a file.  This requires
-# the extension of the file to be retained in the temp location, but
-# afterwards it works nicely for eclasses and ebuilds, as well as
-# ChangeLogs.
-# <grobian@gentoo.org> -- 2006-09-22
-# eupdate: a not yet fully complete bucket of voodoo to sync a the
-# prefix tree with the mainline tree.  Strategies followed are largerly
-# based on cvs revision numbers and diffs between those revisions.  For
-# the real internals, please look at the comments below in the code.  In
-# general, this script checks if an ebuild contains the most recent
-# changes to it, and if there is a newer ebuild available.  In both
-# cases (cross) diffing techniques are used to maintain the manually
-# made changes.
-#
-# This script doesn't run out of the box, you have to feed it some paths
-# so it can do it's magic stuff.  Also, you have to be a gentoo
-# developer with cvs access.  (Or when anoncvs is available, every user
-# can do it.)  For your convenience it is intended that you rename this
-# file to something without the .in and change the paths below.
-
-# Main Tree Directory, an rsynced portage tree is fine
-[[ -z $MTREEDIR ]] && MTREEDIR='/path/to/rsync-gentoo-x86'
-# Prefix offset
-[[ -z $EPREFIX ]] && EPREFIX=$(portageq envvar EPREFIX)
-# Prefix Tree Directory
-[[ -z $PTREEDIR ]] && PTREEDIR="`cd ${EPREFIX}/usr/portage && pwd -P`"
-# How to reach the CVS server for retrieving revision diffs, devs can
-# use their ssh access for the most up-to-date tree.  You can use the
-# anonymous CVS (:pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot) or
-# HTTP-based webcvs (http://sources.gentoo.org/viewcvs.py).  We default
-# to the first since it should be less stressful for the server.
-[[ -z $CVSROOT ]] && CVSROOT=':pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot'
-
-# Don't touch this.  You really don't want to.
-CVSMODULE='gentoo-x86'
-# Voodoo to figure out what package you're currently messing with
-EPACKAGE="`pwd -P`"; EPACKAGE=${EPACKAGE#*${PTREEDIR}/}
-
-[[ -e "${EPREFIX}"/etc/init.d/functions.sh ]] \
-	&& source "${EPREFIX}"/etc/init.d/functions.sh \
-	|| echo "!!! cannot find functions.sh !!!"
-
-[[ -z $DO_INDENT ]] || RC_INDENTATION=$DO_INDENT
-
-# file used for subshell communication (in /tmp, so swap on Solaris)
-gf=/tmp/eupdate.subshell.$$
-
-# returns the CVS revision number from the $Header
-get_cvsversion() {
-	if [[ -z $1 ]] ; then
-		echo 0
-		return
-	fi
-
-	ver=`egrep '(^|[^\\])\\\$(Header|Id):' "$1" | egrep -m1 -o "v [0-9.]+" | head -n1`
-	if [[ $ver == "" ]] ; then
-		echo 0
-		return
-	fi
-	echo ${ver#v }
-}
-
-# Comparator for ebuild version strings.  Returns 0 if both arguments
-# are equal, a number less then 0 if the first argument is smaller than
-# the second, and a number greater then 0 otherwise.  Arguments may be
-# up to full paths to the bare version string only.
-# It is possible to deduce what the largest difference between the two
-# given versions is, by considering the following on the absolute return
-# value: 10000 < x < 0 -> main version, where 1 is a difference in
-# the major, 10 a difference in the minor, etc. 100000 < x < 10000 ->
-# suffix, 1000000 < x < 100000 -> revision.
-cmp_ebuild_ver() {
-	# get the bare version, if not already
-	local l=$(get_ebuildversion $1)
-	local r=$(get_ebuildversion $2)
-
-	if [[ -z $l ]] && [[ -z $r ]]; then
-		echo 0
-		return
-	elif [[ ! -z $l ]] && [[ -z $r ]] ; then
-		echo 1
-		return
-	fi
-
-	local lver=${l%%-*}
-	local lrev=${l#${lver}} ; lrev=${lrev#-}
-	local t=$lver
-	lver=${lver%%_*}
-	local lsuf=${t#${lver}} ; lsuf=${lsuf#_}
-
-	local rver=${r%%-*}
-	local rrev=${r#${rver}} ; rrev=${rrev#-}
-	t=$rver
-	rver=${rver%%_*}
-	local rsuf=${t#${rver}} ; rsuf=${rsuf#_}
-
-	local cnt=1
-	# start "eating" the version from the left, comparing the numbers,
-	# following an exit-early approach
-	while [[ $lver != "" ]] || [[ $rver != "" ]] ; do
-		# get the "head" component
-		local la=${lver%%.*}
-		local ra=${rver%%.*}
-		# unfortunately also characters next to numbers can appear in
-		# the version number, 4a is considered to be smaller than 33
-		local lan=${la%%[a-zA-Z]*}
-		local ran=${ra%%[a-zA-Z]*}
-
-		# deal with 1.0301 < 1.30
-		while [[ ${lan} == 0* && ${ran} == 0* ]] ; do
-			lan=${lan#0}
-			ran=${ran#0}
-		done
-		if [[ ${lan} == 0* ]] ; then
-			[[ -z ${ran} ]] && echo ${cnt} || echo -${cnt}
-			return
-		elif [[ ${ran} == 0* ]] ; then
-			[[ -z ${lan} ]] && echo -${cnt} || echo ${cnt}
-			return
-		fi
-
-		t=$((lan - ran))
-		if (( ${t} != 0 )) ; then
-			(( $t > 9 )) && t=9
-			(( $t < -9 )) && t=-9
-			echo $((t * cnt))
-			return
-		else
-			# perform string equality... should work
-			if [[ ${la} < ${ra} ]] ; then
-				echo $((-1 * cnt))
-				return
-			elif [[ ${la} > ${ra} ]] ; then
-				echo $cnt
-				return
-			fi
-		fi
-
-		# remove the part we processed (and was equal)
-		lver=${lver#${la}}
-		rver=${rver#${ra}}
-		# strip leading dot (if any)
-		lver=${lver#.}
-		rver=${rver#.}
-
-		(( $cnt < 1000 )) && cnt=$((cnt * 10))
-	done
-
-	# the main version components are equal, dive into the suffices
-	# we need to treat _p special, as it can occur with the other suffices
-
-	# suffix precedence rules:
-	# alpha
-	# beta
-	# pre
-	# rc
-	# (none)
-	# p
-
-	cnt=10000
-	local lan=0
-	case $lsuf in
-		alpha*)
-			lan=-1
-			lsuf=${lsuf#alpha}
-		;;
-		beta*)
-			lan=-2
-			lsuf=${lsuf#beta}
-		;;
-		pre*)
-			lan=-3
-			lsuf=${lsuf#pre}
-		;;
-		rc*)
-			lan=-4
-			lsuf=${lsuf#rc}
-		;;
-		p*)
-			lan=-6
-			lsuf=${lsuf#p}
-		;;
-		*)
-			lan=-5
-		;;
-	esac
-
-	local ran=0
-	case $rsuf in
-		alpha*)
-			ran=-1
-			rsuf=${rsuf#alpha}
-		;;
-		beta*)
-			ran=-2
-			rsuf=${rsuf#beta}
-		;;
-		pre*)
-			ran=-3
-			rsuf=${rsuf#pre}
-		;;
-		rc*)
-			ran=-4
-			rsuf=${rsuf#rc}
-		;;
-		p*)
-			ran=-6
-			rsuf=${rsuf#p}
-		;;
-		*)
-			ran=-5
-		;;
-	esac
-
-	t=$((lan - ran))
-	if (( ${t} != 0 )) ; then
-		echo $((-t * cnt))
-		return
-	fi
-
-	# if lsuf or rsuf starts with a 0, bash thinks it's an octal number
-	if [[ ${lsuf} == 0* || ${rsuf} == 0* ]] ; then
-		lsuf="1${lsuf}"
-		rsuf="1${rsuf}"
-	fi
-
-	lsuf=${lsuf:-0}
-	rsuf=${rsuf:-0}
-	t=$((${lsuf%_p*} - ${rsuf%_p*}))
-	if (( ${t} != 0 )) ; then
-		(( $t > 9 )) && t=9
-		(( $t < -9 )) && t=-9
-		echo $((t * cnt))
-		return
-	fi
-	# we may have a _p in the suffices now, need to compare those
-	case ${lsuf}:${rsuf} in
-		*_p*:*_p*)
-			t=$((${lsuf#*_p} - ${rsuf#*_p}))
-			if (( ${t} != 0 )) ; then
-				(( $t > 9 )) && t=9
-				(( $t < -9 )) && t=-9
-				echo $((t * cnt))
-				return
-			fi
-		;;
-		*_p*:*)
-			echo $cnt
-			return
-		;;
-		*:*_p*)
-			echo -$cnt
-			return
-		;;
-	esac
-
-	# suffices were equal too, now lets see the revision
-
-	cnt=100000
-	lrev=${lrev#r}
-	rrev=${rrev#r}
-	lsrev=0
-	rsrev=0
-	
-	if [[ ${lrev:0:1} == "0" ]] ; then
-		lsrev=${lrev/*./}
-		lrev=${lrev:1}
-		lrev=${lrev/.*/}
-	fi
-	if [[ ${rrev:0:1} == "0" ]] ; then
-		rsrev=${rrev/*./}
-		rrev=${rrev:1}
-		rrev=${rrev/.*/}
-	fi
-
-	t=$((lrev - rrev))
-	(( $t == 0 )) && t=$((lsrev - rsrev))
-	(( $t > 9 )) && t=9
-	(( $t < -9 )) && t=-9
-	echo $((t * cnt))
-}
-
-get_ebuildversion() {
-	if [[ -z $1 ]] ; then
-		return
-	fi
-
-	# strip extension
-	t=${1%.ebuild}
-	# abort if this is not an ebuild
-	if [[ $t == $1 ]] ; then
-		return
-	fi
-	# strip package name
-	t=${t#*-}
-	# sometimes there are dashes in the package name
-	while [[ ${t:0:1} < "0" || ${t:0:1} > "9" ]] ; do
-		[[ $t != ${t#*-} ]] \
-			&& t=${t#*-} \
-			|| break
-	done
-
-	echo ${t}
-}
-
-cross_diff() {
-	mver=$(get_ebuildversion $1)
-	pver=$(get_ebuildversion $2)
-	# $1 is just somewhere, $2 must be local, mte becomes local $1
-	mte=${1##*/}
-	pte=$2
-	# get real main tree corresponding version
-	if [[ ${pte/-r0/-r} == $pte ]] ; then
-		mypte=$pte
-	else
-		# normalise version, so we compare against the original
-		# version from the main tree
-		mypte=${pte%.*.ebuild}.ebuild
-		mypte=${mypte/-r0/-r}
-		mypte=${mypte/-r.ebuild/.ebuild}
-		mypte=${mypte/-r0.ebuild/.ebuild}
-	fi
-	mtecv=$(get_cvsversion $1)
-	ptecv=$(get_cvsversion $2)
-	ewarn "new version in main tree: ${mver} [${pver}] ... cross diff from $ptecv to $mtecv"
-	# checkout both original versions and make the diffs,
-	# ignoring keywords
-	tmp="tmp.${package##*.}"
-	if [[ ${CVSROOT} == "http://"* ]] ; then
-		wget -q -O /var/tmp/$mypte-$ptecv.$tmp \
-			"${CVSROOT}/${CVSMODULE}/${EPACKAGE}/$mypte?rev=$ptecv"
-		wget -q -O /var/tmp/$mte-$mtecv.$tmp \
-			"${CVSROOT}/${CVSMODULE}/${EPACKAGE}/$mte?rev=$mtecv"
-	else
-		cvs -Q -d"${CVSROOT}" \
-			checkout -r$ptecv -p ${CVSMODULE}/${EPACKAGE}/$mypte \
-			> /var/tmp/$mypte-$ptecv.$tmp
-		cvs -Q -d"${CVSROOT}" \
-			checkout -r$mtecv -p ${CVSMODULE}/${EPACKAGE}/$mte \
-			> /var/tmp/$mte-$mtecv.$tmp
-	fi
-	# create the new file to patch against
-	cp $pte $mte
-	# Sanitise the $Header line, because it may differ being in the
-	# Attic or something.  Use version of main tree, to keep updates
-	# working.
-	sed -i \
-		-e 's|^# \$Header:.*$|'"`egrep '^# \\\$Header: ' /var/tmp/$mte-$mtecv.$tmp`"'|' \
-		$mte /var/tmp/$mypte-$ptecv.$tmp
-	# make KEYWORDS void in the diff
-	sed -i \
-		-e 's|^KEYWORDS=.*$|'"$(egrep '^KEYWORDS=' $pte | head -n1)"'|' \
-		/var/tmp/$mypte-$ptecv.$tmp /var/tmp/$mte-$mtecv.$tmp
-	# destroy changes (hopefully) with the prefixed version by eapifying
-	eapify -e /var/tmp/$mypte-$ptecv.$tmp /var/tmp/$mte-$mtecv.$tmp > /dev/null
-	# (attempt to) do it!
-	diff -u /var/tmp/$mypte-$ptecv.$tmp /var/tmp/$mte-$mtecv.$tmp \
-		| patch --no-backup-if-mismatch $mte
-	ret=$?
-	rm /var/tmp/$mypte-$ptecv.$tmp /var/tmp/$mte-$mtecv.$tmp
-	# try to get new patches and stuff
-	fetch_files $mte
-	return $ret
-}
-
-revision_diff() {
-	local mtecv=$1
-	local ptecv=$2
-	local package=$3
-	local pfile=$4
-	# Gentoo never increments the major, and branches are not
-	# allowed, so we can make things easy and only use the minor
-	if [[ ${mtecv#1.} -eq ${ptecv#1.} ]] ; then
-		return
-	elif [[ ${mtecv#1.} -gt ${ptecv#1.} ]] ; then
-		echo "out-of-date, applying diff -r$ptecv -r$mtecv"
-		# checkout both original versions and make the diffs,
-		# ignoring keywords
-		local tmp="tmp.${package##*.}"
-		if [[ ${CVSROOT} == "http://"* ]] ; then
-			wget -q -O /var/tmp/$package-$ptecv.$tmp \
-				"${CVSROOT}/${CVSMODULE}/${EPACKAGE}/$package?rev=$ptecv"
-			wget -q -O /var/tmp/$package-$mtecv.$tmp \
-				"${CVSROOT}/${CVSMODULE}/${EPACKAGE}/$package?rev=$mtecv"
-		else
-			cvs -Q -d"${CVSROOT}" \
-				checkout -r$ptecv -p ${CVSMODULE}/${EPACKAGE}/$package \
-				> /var/tmp/$package-$ptecv.$tmp
-			cvs -Q -d"${CVSROOT}" \
-				checkout -r$mtecv -p ${CVSMODULE}/${EPACKAGE}/$package \
-				> /var/tmp/$package-$mtecv.$tmp
-		fi
-		# make KEYWORDS void in the diff
-		[[ ${package##*.} == "ebuild" ]] && sed -i \
-			-e 's|^KEYWORDS=.*$|'"$(egrep '^KEYWORDS=' $pfile | head -n1)"'|' \
-			/var/tmp/$package-$mtecv.$tmp /var/tmp/$package-$ptecv.$tmp
-		if [[ ${package} != "ChangeLog" ]] ; then
-			# destroy changes (hopefully) with the prefixed version by eapifying
-			eapify /var/tmp/$package-$ptecv.$tmp /var/tmp/$package-$mtecv.$tmp > /dev/null
-			# if the file was checked out by ecopy from the web, correct the
-			# header so we don't get conflicts because of that
-			sed -i -e '/^# $Header:/s:/var/www/viewcvs.gentoo.org/raw_cvs:/var/cvsroot:' \
-				$pfile
-			# show what's going to change
-			diff -U 1 /var/tmp/$package-$ptecv.$tmp /var/tmp/$package-$mtecv.$tmp
-			local chng=$?
-			# (attempt to) do it!
-			diff -u /var/tmp/$package-$ptecv.$tmp /var/tmp/$package-$mtecv.$tmp \
-				| patch --no-backup-if-mismatch $pfile
-			local ret=$?
-			# try to get new patches and stuff
-			fetch_files $pfile
-		else
-			# treat ChangeLogs different, so we can have appends both in
-			# gx86 and Prefix (repoman insists)
-
-			# first zap the headers, so we don't get any changes there
-			sed -i \
-				-e '1c\# ChangeLog for '"${EPACKAGE}" \
-				-e '2c\# Copyright 1999-'"$(date +%Y)"' Gentoo Foundation; Distributed under the GPL v2' \
-				/var/tmp/$package-$mtecv.$tmp
-			{
-				echo "@@ -1,3 +1,3 @@"
-				head -n3 /var/tmp/$package-$ptecv.$tmp | sed -e 's/^/-/'
-				head -n3 $pfile | sed -e 's/^/+/'
-			} | patch -r - --no-backup-if-mismatch /var/tmp/$package-$ptecv.$tmp
-			
-			# then just take the first hunk, nothing more
-			diff -U 1 /var/tmp/$package-$ptecv.$tmp /var/tmp/$package-$mtecv.$tmp | sed -e '4,$s/^@@ .*$/REMOVEMEXXXXXX/' | sed -e '/REMOVEMEXXXXXX/,$d'
-			local chng=$?
-			diff -U 0 /var/tmp/$package-$ptecv.$tmp /var/tmp/$package-$mtecv.$tmp | \
-				sed -e '4,$s/^@@ .*$/REMOVEMEXXXXXX/' | \
-				sed -e '/REMOVEMEXXXXXX/,$d' | \
-				patch --no-backup-if-mismatch $pfile
-			local ret=$?
-		fi
-		[[ $ret == 0 ]] && ret=$chng
-		rm /var/tmp/$package-$ptecv.$tmp /var/tmp/$package-$mtecv.$tmp
-		return $ret
-	fi
-}
-
-fetch_files() {
-	local mver=$(get_ebuildversion $1)
-	local pn=${EPACKAGE##*/}
-	local pv=${mver%-r*}
-	local pr=${mver#${pv}} ; pr=${pr#-} ; pr=${pr:-r0}
-	local pf=${pn}-${mver}
-	local p=$pn-$pv
-	local t=""
-
-	# ebuild.sh and friends provided often occurring funcs
-	local funcs='
-	EXPORT_FUNCTIONS() { :; }
-	has() { :; }
-	hasq() { :; }
-	use() { :; }
-	use_enable() { :; }
-	use_with() { :; }
-	addwrite() { :; }
-	addpredict() { :; }
-	debug-print-function() { :; }
-	debug-print() { :; }
-	inherit() {
-		for p in $*; do
-			if [[ -f '"${PTREEDIR}"'/eclass/${p}.eclass ]]; then
-				source '"${PTREEDIR}"'/eclass/${p}.eclass
-			else
-				source '"${MTREEDIR}"'/eclass/${p}.eclass
-			fi
-		done
-	}
-	:'
-
-	# Find all "referenced" files from/to FILESDIR.  We keep ${FILESDIR}
-	# in, to just use a bash eval on what we found to get the right
-	# path.
-	eindent
-	sed \
-		-e '/FILESDIR/!d' \
-		-e 's/^.*[^"]\("\?\${FILESDIR}\)/\1/' \
-		-e 's/#.*$//' \
-		-e 's/\\$//' \
-		$1 | \
-	while read l ; do
-		t=$(eval a='$l'; for i in $a ; do echo $i ; break ; done)
-		t=$(env -i P=$p PN=$pn PV=$pv PR=$pr PVR=$mver PF=$pf FILESDIR=files $(type -P bash) -c "${funcs}; source $1; echo $t")
-		# we can have file{1,2} stuff in the first t here, so iterate
-		# over the result list...
-		for u in $t ; do
-			if [[ ! -e $u ]] ; then
-				ewarn "copying $u"
-				[[ ! -d $(dirname $u) ]] && mkdir -p $(dirname $u)
-				cp -R "${MTREEDIR}/${EPACKAGE}"/$u $u
-			fi
-		done
-	done
-	eoutdent
-}
-
-diff_patch() {
-	( diff -u $2 "${MTREEDIR}/${EPACKAGE}"/$1 ; echo $? > $gf ) | patch $2
-	local ret=$?
-	[[ ${ret} == 0 ]] && ret=$(< $gf)
-	rm $gf
-	# try to get new patches and stuff
-	fetch_files $2
-	return $ret
-}
-
-update_file() {
-	# on directories, recurse
-	if [[ -d $1 ]] ; then
-		eindent
-		# recurse into this directory (don't update digests)
-		f=$(ls -p $1 | egrep -v "^digest-")
-		[[ ! -z $f ]] && ( cd $1 && DO_INDENT=$RC_INDENTATION eupdate $f ; ret=$? )
-		eoutdent
-		return $ret
-	fi
-
-	# check existence of files
-	if [[ ! -f $2 ]] ; then
-		echo "no such file: $2"
-		return -1
-	fi
-	if [[ ! -f "${MTREEDIR}/${EPACKAGE}"/$1 ]] ; then
-		echo "$1 not found in the main tree"
-		return 0
-	fi
-
-	# see if the file has a CVS header
-	local mtecv=$(get_cvsversion "${MTREEDIR}/${EPACKAGE}"/$1)
-	local ptecv=$(get_cvsversion $2)
-	if [[ $mtecv == 0 ]] && [[ $ptecv == 0 ]] ; then
-		diff_patch $1 $2
-		return $?
-	else
-		revision_diff $mtecv $ptecv $1 $2
-		return $?
-	fi
-}
-
-do_check_file() {
-	local mfile=$1
-	local pfile=$2
-	local msg=""
-	if [[ -z $3 ]] ; then
-		[[ $pfile != $mfile ]] \
-			&& msg="checking $mfile/$pfile" \
-			|| msg="checking $mfile"
-	else
-		msg=$3
-	fi
-
-	if [[ -d $mfile ]] ; then
-		einfo "$msg (a directory)"
-		update_file $pfile
-		return $?
-	fi
-
-	ebegin $msg
-	local err=$(update_file $mfile $pfile ; echo $? > $gf)
-	local ret=$(< $gf)
-	rm $gf
-	[[ $ret < 0 ]] && eend -1 || eend 0
-	if [[ ! -z $err ]] ; then
-		if [[ $mfile != $pfile ]] ; then
-			[[ $ret < 0 ]] \
-				&& eerror "$mfile/$pfile: $err" \
-				|| ewarn "$mfile/$pfile: $err"
-		else
-			[[ $ret < 0 ]] \
-				&& eerror "$mfile: $err" \
-				|| ewarn "$mfile: $err"
-		fi
-	fi
-
-	return $ret
-}
-
-# if the user gave some files on the command line, try to update those
-if [[ ${#*} > 0 ]] ; then
-	while [[ ${#*} > 0 ]] ; do
-		if [[ ${1/->/} != ${1} ]] ; then
-			# if a a.1.ebuild->a.2.ebuild is given, we force a
-			# cross-diff from a.1 to a.2
-			cross_diff ${MTREEDIR}/${EPACKAGE}/${1#*->} ${1%->*}
-		elif [[ ${1#=} != ${1} ]] ; then
-			# try to fetch files for this ebuild
-			fetch_files ${1#=}
-		elif [[ -f $1 ]] ; then
-			# $1 just exists, just update
-			do_check_file $1 $1
-		elif [[ ! -f ${MTREEDIR}/${EPACKAGE}/$1 ]] ; then
-			# kind of lazy way of saying "file not found"
-			do_check_file $1 $1
-		else
-			# move over the file
-			ewarn "copying $1"
-			cp "${MTREEDIR}/${EPACKAGE}"/$1 .
-			eapify $1
-			ecleankw $1
-			fetch_files $1
-		fi
-		shift
-	done
-
-	# we're done
-	exit 0
-fi
-
-if [[ ! -d ${MTREEDIR}/${EPACKAGE} ]] ; then
-	eerror "no such package in main tree: ${EPACKAGE}"
-	exit 2
-fi
-
-if [[ ${EPACKAGE} == "eclass" || ${EPACKAGE} == "licenses" || ${EPACKAGE} == "updates" || ${EPACKAGE} == "desc" ]] ; then
-	einfo "Processing ${EPACKAGE} directory"
-	excode=0
-	mt=`cd "${MTREEDIR}"/${EPACKAGE}/ && ls -p`
-	pt=`ls -p`
-	# nested loop join
-	for pte in $pt ; do
-		had_match=0
-		for mte in $mt ; do
-			if [[ $pte == $mte ]] ; then
-				do_check_file $mte $pte
-				ret=$?
-				if [[ $ret < 0 ]] || [[ $ret > 1 ]] ; then
-					excode=-1
-				elif [[ $excode == 0 ]] ; then
-					excode=$ret
-				fi
-				had_match=1;
-				# we don't need $pte/$mte any more
-				pt=${pt/$pte/}
-				mt=${mt/$mte/}
-				break;
-			fi
-		done
-		[[ $had_match == 0 ]] \
-			&& ewarn "warning: $pte no longer in the main tree"
-	done
-
-	# everything left in $mt now is what's not in $pt, let's make a
-	# note about them and perform a copy
-	for mte in $mt ; do
-		ewarn "adding from main tree: $mte"
-		cp "${MTREEDIR}"/${EPACKAGE}/$mte .
-	done
-
-	exit $excode
-fi
-
-einfo "Processing ${EPACKAGE}"
-excode=0
-mt=`cd "${MTREEDIR}"/${EPACKAGE}/ && ls -p | egrep -v "^Manifest$"`
-pt=`ls -p | egrep -v "^Manifest$"`
-# do a nested loop join, we don't assume any order
-for pte in $pt ; do
-	had_match=0
-	mypte=$pte
-	for mte in $mt ; do
-		# calculate the diffs between prefix and main
-		if [[ ${pte} == *-r0* ]] ; then
-			# normalise version, so we compare against the original
-			# version from the main tree
-			mypte=${pte%.*.ebuild}.ebuild
-			mypte=${mypte/-r0/-r}
-			mypte=${mypte/-r.ebuild/.ebuild}
-			mypte=${mypte/-r0.ebuild/.ebuild}
-		fi
-		vdiff=$(cmp_ebuild_ver $mte $mypte)
-		# if we have the same ebuild version... (or file)
-		if [[ $vdiff == 0 ]] && [[ $mte == $mypte ]] ; then
-			had_match=1
-			# ... look inside the files to see if the file was updated or not
-			do_check_file $mte $pte
-			ret=$?
-			if [[ $ret < 0 ]] || [[ $ret > 1 ]] ; then
-				excode=-1
-			elif [[ $excode == 0 ]] ; then
-				excode=$ret
-			fi
-			# we found this version, so needless to look for it any more
-			mt=${mt/$mte/}
-		fi
-	done
-	# stale entry
-	[[ $had_match == 0 ]] \
-		&& ewarn "warning: $pte (${mypte}) no longer in the main tree"
-done
-# what's left in $mt is everything which is not in $pt
-# find the latest revisions/alpha/beta/pre and see if there is a more
-# recent revision in the main tree
-last_pte=""
-for pte in $pt ; do
-	# skip over non-ebuilds
-	if [[ ${pte} != *.ebuild ]] ; then
-		pt=${pt/${pte}/}
-		continue
-	fi
-	for xpte in $pt ; do
-		# check against the rest
-		[[ $(cmp_ebuild_ver $pte $xpte) -ge 10000 ]] \
-			&& pt=${pt/$xpte/}
-	done
-	[[ $(cmp_ebuild_ver $pte $last_pte) > 0 ]] \
-		&& last_pte=$pte
-done
-# for all ebuilds (the latest revisions/alpha/beta/pre) we check if
-# there is a more recent revision in the main tree
-for pte in $pt ; do
-	last_rev=""
-	for mte in $mt ; do
-		# kill live CVS ebuilds
-		v=$(get_ebuildversion ${mte})
-		if [[ ${v} == 9999 || ${v} == 99999999 ]] ; then
-			mt=${mt/$mte/}
-			continue
-		fi
-
-		if [[ $(cmp_ebuild_ver $mte $pte) -ge 10000 ]] ; then
-			[[ $(cmp_ebuild_ver $mte $last_rev) > 0 ]] \
-				&& last_rev=$mte
-			# we will deal with the (newer) revision later, so let's
-			# avoid the final update check below finding this revision
-			mt=${mt/$mte/}
-		fi
-	done
-	if [[ $last_rev != "" ]] ; then
-		cross_diff ${MTREEDIR}/${EPACKAGE}/$last_rev $pte
-		ret=$?
-		if [[ $ret < 0 ]] || [[ $ret > 1 ]] ; then
-			excode=-1
-		elif [[ $excode -ge 0 ]] ; then
-			excode=1	# not 0, as we changed something (added a file)
-		fi
-	fi
-done
-# if there is anything left in mt that is bigger than last_pte we want
-# the biggest of that
-last_mte=""
-for mte in $mt ; do
-	# skip over non-ebuilds
-	[[ ${mte} != *.ebuild ]] && continue
-	[[ $(cmp_ebuild_ver $mte $last_pte) > 0 ]] && \
-	[[ $(cmp_ebuild_ver $mte $last_mte) > 0 ]] \
-		&& last_mte=$mte
-done
-if [[ $last_mte != "" ]] ; then
-	if [[ $last_pte != "" ]] ; then
-		# we have to apply an update from $last_pte to $last_mte
-		cross_diff ${MTREEDIR}/${EPACKAGE}/$last_mte $last_pte
-		ret=$?
-		if [[ $ret < 0 ]] || [[ $ret > 1 ]] ; then
-			excode=-1
-		elif [[ $excode -ge 0 ]] ; then
-			excode=1	# not 0, as we changed something (added a file)
-		fi
-	else
-		# this is from an empty directory, get the last one and relevant
-		# files
-		if [[ -f ${MTREEDIR}/${EPACKAGE}/metadata.xml ]] ; then
-			ewarn "copying metadata.xml"
-			cp "${MTREEDIR}/${EPACKAGE}"/metadata.xml .
-		fi
-		if [[ -f ${MTREEDIR}/${EPACKAGE}/ChangeLog ]] ; then
-			ewarn "copying ChangeLog"
-			cp "${MTREEDIR}/${EPACKAGE}"/ChangeLog .
-		fi
-		if [[ -f ${MTREEDIR}/${EPACKAGE}/Manifest ]] ; then
-			ewarn "copying Manifest"
-			cp "${MTREEDIR}/${EPACKAGE}"/Manifest .
-		fi
-		ewarn "copying $last_mte"
-		cp "${MTREEDIR}/${EPACKAGE}"/$last_mte .
-		eapify $last_mte
-		ecleankw $last_mte
-		fetch_files $last_mte
-	fi
-fi
-
-exit $excode

diff --git a/scripts/keyword-check.rb b/scripts/keyword-check.rb
deleted file mode 100755
index 71bb8695e1..0000000000
--- a/scripts/keyword-check.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby -w
-# Copyright 2008-2014 Gentoo Foundation; Distributed under the GPL v2
-
-%w{ pathname set }.each {|lib| require lib}
-
-lines = Pathname.new( 'profiles/arch.list' ).readlines
-allowed = lines.collect {|line| line.chomp }.reject {|line|
-	line.slice( 0, 1 ) == '#' or line.empty?
-}
-
-kmods = Set.new %w{ ~ - }
-
-start = Time.now
-problemCnt = 0
-
-Pathname.new( '.' ).find {|file| 
-	next unless file.fnmatch? '*/*/*.ebuild'
-	file.readlines.each {|line|
-		unless line.slice( 0, 9 ) == 'KEYWORDS='
-			next
-		else
-			kws = line.chomp.slice( 10..-2 )
-			break if kws.empty?
-			forbidden = Array.new
-			stable    = Array.new
-			kws.split.each {|kw|
-				# keywords are only allowed to start with a tilde for now but
-				# keywords are only stable if there is no - in front of them
-				stable << kw if is_stable = !kmods.include?( kw.slice( 0, 1 ) )
-				forbidden << kw unless allowed.include?(
-					is_stable ? kw : kw.slice( 1..-1 )
-				)
-			}
-			if stable.any? or forbidden.any?
-				puts 'EBUILD    : %s' % [ file.dirname.dirname + file.basename ]
-				puts 'stable    : %s' % stable.join( " "  ) if stable.any?
-				puts 'forbidden : %s' % forbidden.join( " " ) if forbidden.any?
-				puts
-				problemCnt += 1
-			end
-			break
-		end
-	}
-}
-
-if problemCnt > 0
-	puts 'found %d packages with problems in %.1fs' %
-		[ problemCnt, (Time.new - start) ]
-end
-
-# vim: set ts=4 sw=4 noexpandtab:

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     468e606f16bdc3ae5c59ddc75cf2f02b309951aa
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 10:12:58 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 10:12:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=468e606f

scripts/bootstrap-prefix: update copyright

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ccc4d5070e..2c564b1b1f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2006-2020 Gentoo Authors; Distributed under the GPL v2
+# Copyright 2006-2021 Gentoo Authors; Distributed under the GPL v2
 
 trap 'exit 1' TERM KILL INT QUIT ABRT
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c4442d7097376a04b95333dee567740a64ff75ee
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 10:11:09 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 10:11:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c4442d70

scripts/bootstrap-prefix: drop obsolete stuff from bootstrap_python

Long time ago, we used Gentoo-patched Python sources.  We no longer do
(because it's less work, and no longer necessary for the most part) so
remove the Gentoo-specific bit PYTHON_DISABLE_MODULES that doesn't do
anything now.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 82b8693832..ccc4d5070e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1070,7 +1070,6 @@ bootstrap_python() {
 	# just make sure Python won't find it
 	export HOME="${S}"
 
-	export PYTHON_DISABLE_MODULES="_bsddb bsddb bsddb185 bz2 crypt _ctypes_test _curses _curses_panel dbm _elementtree gdbm _locale nis pyexpat readline _sqlite3 _tkinter"
 	export OPT="${CFLAGS}"
 
 	einfo "Compiling ${A%.tar.*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4299fe599935c31396e50e031cd6eac77c77260b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 10:29:08 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 10:29:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4299fe59

scripts/bootstrap-prefix: bump tree snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2c564b1b1f..408ecb06c9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -531,7 +531,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20201211"
+	local PV="20210102"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     26dca920b3f483627ddfff332aff7d4c5b47f6fd
Author:     Jacob Floyd <cognifloyd <AT> gmail <DOT> com>
AuthorDate: Fri Dec  4 02:37:47 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 14:37:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=26dca920

scripts/bootstrap-prefix: Fix Python for stage3 on Darwin

Patch stage1 bootstrapped python to disable _scproxy module (which is
what the ebuild does), to avoid a backtrace when it tries to use the
network.

Bug: https://bugs.gentoo.org/758167

Signed-off-by: Jacob Floyd <cognifloyd <AT> gmail.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 408ecb06c9..0dda8055df 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1012,6 +1012,14 @@ bootstrap_python() {
 		;;
 	esac
 
+	case ${CHOST} in
+	(*-darwin*)
+		# avoid triggering compiled out system proxy retrieval code (_scproxy)
+		sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \
+			Lib/urllib/request.py
+		;;
+	esac
+
 	fix_config_sub
 
 	local myconf=""

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     537cf3c7be556926c8d69eaf738d3bbf991be837
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 10:36:13 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 10:36:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=537cf3c7

scripts/bootstrap-prefix: add fallback for cmake bootstrap

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0dda8055df..68a8a5c4fa 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1108,7 +1108,7 @@ bootstrap_python() {
 	einfo "${A%.tar.*} bootstrapped"
 }
 
-bootstrap_cmake() {
+bootstrap_cmake_core() {
 	PV=${1:-3.16.5}
 	A=cmake-${PV}.tar.gz
 
@@ -1155,6 +1155,10 @@ bootstrap_cmake() {
 	einfo "${A%.tar.*} bootstrapped"
 }
 
+bootstrap_cmake() {
+	bootrstrap_cmake_core 3.16.5 || bootrstrap_cmake_core 3.0.2
+}
+
 bootstrap_zlib_core() {
 	# use 1.2.8 by default, current bootstrap guides
 	PV="${1:-1.2.8}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     518ac309d3724bfa2ea201451a260731b82f042e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 10:56:17 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 10:56:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=518ac309

scripts/bootstrap-prefix: bootstrap cmake on ppc-macos too

Since darwin-xtools is being pulled in now, we need cmake for that too,
so install one (older version) and pray that it is sufficient.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 21c420ba80..7927faf1bb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1516,7 +1516,7 @@ bootstrap_stage1() {
 	then
 		# TODO: make DARWIN_USE_GCC path also activated on ppc-macos,
 		# since it effectively is so
-		if [[ ${DARWIN_USE_GCC} != 1 && ${CHOST} != powerpc* ]] ; then
+		if [[ ${DARWIN_USE_GCC} != 1 || ${CHOST} == powerpc* ]] ; then
 			(bootstrap_cmake) || return 1
 		fi
 	fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0b8ebc2be9458ea07c1143c2a20937d353cd6284
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 10:55:24 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 10:55:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0b8ebc2b

scripts/bootstrap-prefix: de-typo bootstrap ...

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 68a8a5c4fa..21c420ba80 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1156,7 +1156,7 @@ bootstrap_cmake_core() {
 }
 
 bootstrap_cmake() {
-	bootrstrap_cmake_core 3.16.5 || bootrstrap_cmake_core 3.0.2
+	bootstrap_cmake_core 3.16.5 || bootstrap_cmake_core 3.0.2
 }
 
 bootstrap_zlib_core() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     573a1115080c15caea73944aaafb333e2a2ae3d3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 12:28:26 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 12:28:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=573a1115

scripts/bootstrap-prefix: ensure status doesn't seem to be stuck

emerge doesn't update the window title in stage3, so ensure it doesn't
wrongly say it's updating the tree

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7927faf1bb..9a8d0bf459 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2113,11 +2113,13 @@ bootstrap_stage3() {
 	# still with an old llvm that may not understand the system headers
 	# very well on Darwin (-DGNUSTEP_BASE_VERSION hack)
 	einfo "running emerge -u system"
+	estatus "stage3: emerge -u system"
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
 	CFLAGS= CXXFLAGS= emerge --color n -u system || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"
+	estatus "stage3: emerge --depclean"
 	emerge --color n --depclean
 
 	# "wipe" mtimedb such that the resume list is proper after this stage

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     6fd9932cd2bf2cdcdab00d0915e289114104b99e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 08:44:01 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 08:44:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6fd9932c

scripts/bootstrap-prefix: bump snapshot for misc fixes

- Darwin: Python, Portage
- Linux: binutils

Bug: https://bugs.gentoo.org/754753
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9a8d0bf459..265ca4693c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -531,7 +531,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210102"
+	local PV="20210104"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f0d352a9364580670e00793ff2683d578f66f72d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 08:27:03 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 08:30:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f0d352a9

scripts/bootstrap-prefix: unify DARWIN_USE_GCC path

- turn ppc-macos into DARWIN_USE_GCC
- drop sys-libs/csu from stage1/2 packages, it's not necessary

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 56 +++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 265ca4693c..40a38c6147 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -186,34 +186,27 @@ configure_toolchain() {
 	CXX=g++
 
 	case ${CHOST}:${DARWIN_USE_GCC} in
-		powerpc-*darwin*|*:1)
+		*darwin*:1)
 			einfo "Triggering Darwin with GCC toolchain"
-			compiler_stage1+=" sys-apps/darwin-miscutils sys-libs/csu"
-			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
+			compiler_stage1+=" sys-apps/darwin-miscutils"
+			local ccvers="$(unset CHOST; /usr/bin/gcc --version 2>/dev/null)"
 			case "${ccvers}" in
-				*"(Gentoo "*)
-					# probably the result of a bootstrap in progress
-					[[ ${DARWIN_USE_GCC} == 1 ]] \
-						&& linker=sys-devel/native-cctools \
-						|| linker=sys-devel/binutils-apple
-					;;
 				*"(GCC) 4.2.1 "*)
-					linker=sys-devel/binutils-apple
+					linker="=sys-devel/binutils-apple-3.2.6"
 					;;
 				*"(GCC) 4.0.1 "*)
 					linker="=sys-devel/binutils-apple-3.2.6"
 					# upgrade to 4.2.1 first
 					compiler_stage1+="
 						sys-devel/gcc-apple
-						sys-devel/binutils-apple"
+						=sys-devel/binutils-apple-3.2.6"
 					;;
 				*"Apple clang version "*|*"Apple LLVM version "*)
-					# gcc cannot build (recent) binutils-apple due to
-					# missing blocks support, so use Xcode provided
-					# linker/assembler
-					# UPDATE: binutils-8.2.1-r100 compiles, but the
-					# assembler isn't able to deal with AVX instructions
-					# (yet)
+					# recent binutils-apple are hard to build (C++11
+					# features, and cmake buildsystem) so avoid going
+					# there, the system ld is good enough to bring us to
+					# stage3, after which system set will take care of
+					# the rest
 					linker=sys-devel/native-cctools
 					;;
 				*)
@@ -227,9 +220,9 @@ configure_toolchain() {
 			einfo "Triggering Darwin with LLVM/Clang toolchain"
 			# for compilers choice, see bug:
 			# https://bugs.gentoo.org/show_bug.cgi?id=538366
-			compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu"
+			compiler_stage1="sys-apps/darwin-miscutils"
 			compiler_type="clang"
-			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
+			local ccvers="$(unset CHOST; /usr/bin/gcc --version 2>/dev/null)"
 			local llvm_deps="dev-util/ninja"
 			case "${ccvers}" in
 				*"Apple clang version "*|*"Apple LLVM version "*)
@@ -256,7 +249,6 @@ configure_toolchain() {
 			esac
 
 			compiler="
-				sys-libs/csu
 				dev-libs/libffi
 				${llvm_deps}
 				sys-libs/libcxxabi
@@ -270,7 +262,7 @@ configure_toolchain() {
 			# TODO: target clang toolchain someday?
 			;;
 		*-solaris*)
-			local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
+			local ccvers="$(unset CHOST; gcc --version 2>/dev/null)"
 			case "${ccvers}" in
 				*"gcc (GCC) 3.4.3"*)
 					# host compiler doesn't cope with the asm introduced
@@ -531,7 +523,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210104"
+	local PV="20210105"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -1512,14 +1504,11 @@ bootstrap_stage1() {
 	# too vital to rely on a host-provided one
 	[[ -x ${ROOT}/tmp/usr/bin/python ]] || (bootstrap_python) || return 1
 
-	if [[ ! -e ${ROOT}/tmp/usr/bin/cmake ]] && [[ ${CHOST} == *-darwin* ]]
-	then
-		# TODO: make DARWIN_USE_GCC path also activated on ppc-macos,
-		# since it effectively is so
-		if [[ ${DARWIN_USE_GCC} != 1 || ${CHOST} == powerpc* ]] ; then
-			(bootstrap_cmake) || return 1
-		fi
-	fi
+	# cmake for llvm/clang toolchain on macOS
+	[[ -e ${ROOT}/tmp/usr/bin/cmake ]] \
+		|| [[ ${CHOST} != *-darwin* ]] \
+		|| [[ ${DARWIN_USE_GCC} == 1 ]] \
+		|| (bootstrap_cmake) || return 1
 
 	# checks itself if things need to be done still
 	(bootstrap_tree) || return 1
@@ -3073,8 +3062,11 @@ esac
 
 # handle GCC install path on recent Darwin
 case ${CHOST} in
-	powerpc-*darwin*|arm64-*darwin*)
-		unset DARWIN_USE_GCC  # there is no choice here, don't trigger GCC path
+	powerpc-*darwin*)
+		DARWIN_USE_GCC=1  # must use GCC, Clang is impossible
+		;;
+	arm64-*darwin*)
+		DARWIN_USE_GCC=0  # cannot use GCC yet (needs silicon support)
 		;;
 	*-darwin*)
 		# normalise value of DARWIN_USE_GCC

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     27d8dbefa592313398df5124dcb544be5103ea7f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 11:40:23 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 11:40:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=27d8dbef

scripts/bootstrap-prefix: add marker for RAP bootstraps

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 40a38c6147..5f7be2fb31 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -277,6 +277,9 @@ configure_toolchain() {
 				*)            export NM="$(type -P nm) -p" ;;  # Solaris nm
 			esac
 			;;
+		*-linux*)
+			is-rap && einfo "Triggering Linux RAP bootstrap"
+			;;
 	esac
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     73601f515574bdb1200a83aea432b31805882d46
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 09:29:30 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 15:12:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=73601f51

scripts/bootstrap-prefix: bump tree for pkgconf fix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5f7be2fb31..114fee840a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -526,7 +526,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210105"
+	local PV="20210108"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f6b08b692f966cc9a1475eba613cadbb66658412
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 18:58:23 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 18:59:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6b08b69

scripts/bootstrap-prefix: show package list on @system completion too

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 114fee840a..2f1a7274f7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2107,7 +2107,7 @@ bootstrap_stage3() {
 	einfo "running emerge -u system"
 	estatus "stage3: emerge -u system"
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
-	CFLAGS= CXXFLAGS= emerge --color n -u system || return 1
+	CFLAGS= CXXFLAGS= emerge --color n -u -v system || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     07c18b0dbdfba0974533e3df9f6fb6db26b2da92
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 07:38:15 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 07:38:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=07c18b0d

scripts/bootstrap-prefix: bump tree snapshot for darwin

- gcc profiles switched to ld64
- masks for wget and findutils (gnulib breakage)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2f1a7274f7..d8cc130814 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -526,7 +526,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210108"
+	local PV="20210110"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3e64a92a1d23111bd61a849250b0337d653c3f61
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 07:08:04 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 07:08:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3e64a92a

scripts/bootstrap-prefix: bump snapshot for BigSur ld fix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d8cc130814..3f6064f389 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -526,7 +526,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210110"
+	local PV="20210113"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a04d0b455318d4222370beeb4b9b0c809fabf060
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 10:37:00 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 10:37:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a04d0b45

scripts/bootstrap-prefix.sh: bump bootstrap portage version

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3f6064f389..95d0b27de9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -593,8 +593,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="3.0.12"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.12"
+	STABLE_PV="3.0.12.0.2"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.12.0.2"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%.tar.*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2f324a4884cc86fecd8b00403b6f51636855f2e3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 07:14:42 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 07:14:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2f324a48

scripts/bootstrap-prefix: bump snapshot for cmake fix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 95d0b27de9..e0393155f0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -526,7 +526,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210113"
+	local PV="20210114"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b1bf109203b1a4062c58a87e5dcf52772b48c127
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 07:10:27 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 07:10:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b1bf1092

scripts/bootstrap-prefix: bump snapshot for sparc64-solaris

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e0393155f0..d9d80388f7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -526,7 +526,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210114"
+	local PV="20210118"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5cee313b0f91e5ca995bc53b1ecf69b9a796551c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 11:56:25 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 11:56:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5cee313b

scripts/bootstrap-prefix: fix configure_toolchain for non-RAP Linux

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d9d80388f7..056aa72d78 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -281,6 +281,8 @@ configure_toolchain() {
 			is-rap && einfo "Triggering Linux RAP bootstrap"
 			;;
 	esac
+
+	return
 }
 
 bootstrap_setup() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e68e4eabac0cdea6de91bcdd9774ead7babe7c0f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 07:46:10 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 07:46:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e68e4eab

scripts/bootstrap-prefix: use newer libressl for macOS 11.2

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bba4e97fe2..bf77a31a92 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1345,6 +1345,8 @@ bootstrap_bzip2() {
 }
 
 bootstrap_libressl() {
+	bootstrap_simple libressl 3.2.4 gz \
+		https://ftp.openbsd.org/pub/OpenBSD/LibreSSL || \
 	bootstrap_simple libressl 2.8.3 gz \
 		https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     bf2102c70c17f157e528aa4b5c797b0feeb5066b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 18:50:43 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 18:50:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bf2102c7

scripts/bootstrap-prefix.sh: fix atom and only install on required host

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bf77a31a92..100bc892a1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -470,8 +470,9 @@ bootstrap_setup() {
 	sys-devel/native-cctools
 	EOF
 
+	[[ ${CHOST} == arm64-*-darwin* ]] &&
 	cat >> "${ROOT}"/etc/portage/package.accept_keywords <<-EOF
-	sys-devel/gcc-11_pre20200206 **
+	=sys-devel/gcc-11_pre20200206 **
 	EOF
 
 	# Strange enough, -cxx causes wrong libtool config on Cygwin,

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a5ce7ce52234b6921fba5837e966393e2265b17c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 14:18:52 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 14:20:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a5ce7ce5

scripts/bootstrap-prefix: bump bootstrap tree

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 100bc892a1..70a418cb71 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -533,7 +533,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210118"
+	local PV="20210213"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3d12a4fb0cb041c7a6ff652ae0c6b2ca1d0f2a9b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 12:27:51 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 12:27:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3d12a4fb

scripts/bootstrap-prefix: use binutils without gold in stage2

If we don't have a c++ compiler, we're trying to build one, so it helps
in that case if the linker (binutils) doesn't impose a c++ dependency on
us there.

Closes: https://bugs.gentoo.org/770289
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 70a418cb71..6789abd382 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -486,6 +486,7 @@ bootstrap_setup() {
 	# stage2 libstdc++.so might conflict with that of stage3.  The
 	# trade-off is just not to use cxx.
 	dev-libs/gmp -cxx
+	sys-devel/binutils -gold
 	EOF
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7ca9acf145b59b0efb129a52788308e7764971bf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 06:51:08 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 06:51:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7ca9acf1

scripts/bootstrap-prefix: ensure stage1 gcc wrapper is functional

In the these days quite uncommon case of calling the stage functions
directly, stage1's gcc wrapper would use the unset variable STAGE1_PATH.
This variable is normally set in the interactive proze that re-defines
PATH to remove any unwanted stuff.

Avoid this dependency by storing the original value of PATH right at the
startup of the script, such that stage1 can refer to it, whether or not
called from the interactive wrapper or not.

Thanks Sargun Dhillon in bug #779145.

Closes: https://bugs.gentoo.org/779145
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6789abd382..dd534d0aac 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1447,6 +1447,7 @@ bootstrap_stage1() {
 	# we're working with now, bug #650284
 	[[ -x ${ROOT}/tmp/usr/bin/bash ]] \
 		|| (bootstrap_bash) || return 1
+
 	# Some host tools need to be wrapped to be useful for us.
 	# We put them in tmp/usr/local/bin, to not accidentally
 	# be identified as stage1-installed like in bug #615410.
@@ -1475,7 +1476,7 @@ bootstrap_stage1() {
 				# We need to direct the system gcc to find the system binutils.
 				cat >> "${ROOT}"/tmp/usr/local/bin/gcc <<-EOF
 					#! /bin/sh
-					PATH="${STAGE1_PATH}" export PATH
+					PATH="${ORIGINAL_PATH}" export PATH
 					exec "\${0##*/}" "\$@"
 				EOF
 				cp "${ROOT}"/tmp/usr/local/bin/g{cc,++}
@@ -2768,7 +2769,6 @@ EOF
 		# location seems ok
 		break
 	done
-	export STAGE1_PATH=${PATH}
 	export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$EPREFIX/tmp/usr/local/bin:${PATH}"
 
 	cat << EOF
@@ -3078,9 +3078,6 @@ case ${CHOST} in
 	powerpc-*darwin*)
 		DARWIN_USE_GCC=1  # must use GCC, Clang is impossible
 		;;
-#	arm64-*darwin*)
-#		DARWIN_USE_GCC=0  # cannot use GCC yet (needs silicon support)
-#		;;
 	*-darwin*)
 		# normalise value of DARWIN_USE_GCC
 		case ${DARWIN_USE_GCC} in
@@ -3138,6 +3135,7 @@ elif [[ -z $1 ]] ; then
 fi
 
 ROOT="$1"
+ORIGINAL_PATH="${PATH}"
 set_helper_vars
 
 case $ROOT in

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a29cb0c28df448a5c47bf2d793fb63437c7a1feb
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 08:31:48 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 08:31:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a29cb0c2

scripts/bootstrap-prefix: fix non-RAP bootstraps, bug #782880

Force success return at end of configure_toolchain such that a previous
condition expression doesn't accidentially affect the return code.

Thanks hsk17 for finding this issue.

Closes: https://bugs.gentoo.org/782880
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index dd534d0aac..566d692a19 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -282,7 +282,7 @@ configure_toolchain() {
 			;;
 	esac
 
-	return
+	return 0
 }
 
 bootstrap_setup() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2dfc27192fbe00e4661ca06a0b18f09a4137dd50
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  8 06:17:43 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 06:17:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2dfc2719

scripts/bootstrap-prefix: try to get gcc wrapper fixed on PATH

Bug: https://bugs.gentoo.org/794709
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 566d692a19..d1108e6eac 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1477,7 +1477,7 @@ bootstrap_stage1() {
 				cat >> "${ROOT}"/tmp/usr/local/bin/gcc <<-EOF
 					#! /bin/sh
 					PATH="${ORIGINAL_PATH}" export PATH
-					exec "\${0##*/}" "\$@"
+					exec "$(type -P gcc)" "\$@"
 				EOF
 				cp "${ROOT}"/tmp/usr/local/bin/g{cc,++}
 				chmod 755 "${ROOT}"/tmp/usr/local/bin/g{cc,++}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a24caba8b099b2425307b738a88768abbdc7b724
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  8 07:31:22 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 07:31:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a24caba8

scripts/bootstrap-prefix: ensure ORIGINAL_PATH is truely original

Thanks to suggestion of Alfred Wingate in bug 788334.  The value of
ORIGINAL_PATH wasn't quite that original.  Move setting the var before
we tamper with PATH.

Closes: https://bugs.gentoo.org/788334
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d1108e6eac..97ffa2233d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3113,6 +3113,9 @@ case ${CHOST}:${LC_ALL}:${LANG} in
 	;;
 esac
 
+# save original path, need this before interactive, #788334
+ORIGINAL_PATH="${PATH}"
+
 # Just guessing a prefix is kind of scary.  Hence, to make it a bit less
 # scary, we force the user to give the prefix location here.  This also
 # makes the script a bit less dangerous as it will die when just run to
@@ -3135,7 +3138,6 @@ elif [[ -z $1 ]] ; then
 fi
 
 ROOT="$1"
-ORIGINAL_PATH="${PATH}"
 set_helper_vars
 
 case $ROOT in

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     29f4de200d9916a117ec1658c87fad73f3a513e2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  8 09:12:19 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 09:12:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=29f4de20

scripts/bootstrap-prefix: fix g++ wrapper

In 2dfc27192fbe00e4661ca06a0b18f09a4137dd50 the executable name was
fixed, so it wasn't dependant on PATH, however, it broke g++ for that
would still call gcc.  Fix that now.

Mask GCC-11 during stage2 and stage3 for bug #788613.

Bug: https://bugs.gentoo.org/788613
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 97ffa2233d..8fab4abf44 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -450,6 +450,12 @@ bootstrap_setup() {
 	ACCEPT_KEYWORDS="~${ARCH}-linux"
 	EOF
 
+	# bug #788613 avoid gcc-11 during stage 2/3 prior sync/emerge -e
+	is-rap && cat >> "${ROOT}"/etc/portage/make.profile/package.mask <<-EOF
+	# during bootstrap mask, bug #788613
+	>=sys-devel/gcc-11
+	EOF
+
 	# Use package.use to disable in the portage tree to be shared between
 	# stage2 and stage3. The hack will be undone during tree sync in stage3.
 	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
@@ -1355,8 +1361,8 @@ bootstrap_libressl() {
 
 bootstrap_stage_host_gentoo() {
 	if ! is-rap ; then
-		einfo "Shortcut only supports prefix-standalone, but we are bootstrapping"
-		einfo "prefix-rpath. Do nothing."
+		einfo "Shortcut only supports prefix-standalone, but we "
+		einfo "are bootstrapping prefix-rpath.  Do nothing."
 		return 0
 	fi
 	
@@ -1479,7 +1485,11 @@ bootstrap_stage1() {
 					PATH="${ORIGINAL_PATH}" export PATH
 					exec "$(type -P gcc)" "\$@"
 				EOF
-				cp "${ROOT}"/tmp/usr/local/bin/g{cc,++}
+				cat >> "${ROOT}"/tmp/usr/local/bin/g++ <<-EOF
+					#! /bin/sh
+					PATH="${ORIGINAL_PATH}" export PATH
+					exec "$(type -P g++)" "\$@"
+				EOF
 				chmod 755 "${ROOT}"/tmp/usr/local/bin/g{cc,++}
 			fi
 			;;
@@ -1906,7 +1916,11 @@ bootstrap_stage3() {
 	}
 
 	# pre_emerge_pkgs relies on stage 2 portage.
-	pre_emerge_pkgs() { is-rap && without_stack_emerge_pkgs "$@" || with_stack_emerge_pkgs "$@"; }
+	pre_emerge_pkgs() {
+		is-rap \
+			&& without_stack_emerge_pkgs "$@" \
+			|| with_stack_emerge_pkgs "$@"
+	}
 
 	# Some packages fail to properly depend on sys-apps/texinfo.
 	# We don't really need that package, so we fake it instead,

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4d1e44303c0a968a1a2cdc6b5597e862bbfb81bd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 07:09:20 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 07:09:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4d1e4430

scripts/bootstrap-prefix: make stable keyword impl a bit more generic

If we want to support more (Linux) arches in the future with stable
keywords, this should do the trick.

Closes: https://bugs.gentoo.org/759424
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 92a7facc36..c34842da77 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -321,6 +321,9 @@ bootstrap_setup() {
 			if is-rap ; then
 				echo "# sandbox does not work well on Prefix, bug 490246"
 				echo 'FEATURES="${FEATURES} -usersandbox -sandbox"'
+				# bug 759424
+				[[ -n ${STABLE_PREFIX} ]] && \
+					echo 'ACCEPT_KEYWORDS="${ARCH} -~${ARCH}"'
 			fi
 			if [[ ${FS_INSENSITIVE} == 1 ]] ; then
 				echo
@@ -331,8 +334,6 @@ bootstrap_setup() {
 				echo "PORTDIR_OVERLAY=\"\${PORTDIR_OVERLAY} ${PORTDIR_OVERLAY}\""
 			[[ -n ${MAKE_CONF_ADDITIONAL_USE} ]] &&
 				echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
-			[[ -n ${STABLE_PREFIX} ]] && \
-				echo "ACCEPT_KEYWORDS=\"amd64 -~amd64\""
 			[[ ${OFFLINE_MODE} ]] && \
 				echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
 		} > "${ROOT}"/etc/portage/make.conf
@@ -2720,7 +2721,7 @@ EOF
 				[Yy][Ee][Ss]|[Yy]|"")
 					echo "Okay, I'll disable ~amd64 by default."
 					export STABLE_PREFIX="yes"
-					: ;;
+					;;
 				*)
 					echo "Fine, I will not disable ~amd64, no problem."
 					;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     92e83b4212ec23c1ea9d6013343462b85011a6bd
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Mon Jun 14 15:08:57 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 07:03:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=92e83b42

scripts/bootstrap-prefix: do stable prefix on amd64

Bug: https://bugs.gentoo.org/759424
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8fab4abf44..92a7facc36 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -331,6 +331,8 @@ bootstrap_setup() {
 				echo "PORTDIR_OVERLAY=\"\${PORTDIR_OVERLAY} ${PORTDIR_OVERLAY}\""
 			[[ -n ${MAKE_CONF_ADDITIONAL_USE} ]] &&
 				echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
+			[[ -n ${STABLE_PREFIX} ]] && \
+				echo "ACCEPT_KEYWORDS=\"amd64 -~amd64\""
 			[[ ${OFFLINE_MODE} ]] && \
 				echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
 		} > "${ROOT}"/etc/portage/make.conf
@@ -2694,6 +2696,38 @@ EOF
 		esac
 	fi
 
+	# The experimental support for Stable Prefix.
+	# When expanding this to other CHOSTs, don't forget to update
+	# make.conf generation in bootstrap_setup().
+	# TODO: Consider at some point removing the ~ARCH override from
+	# profiles/features/prefix/standalone/make.defaults.
+	# https://bugs.gentoo.org/759424
+	if is-rap ; then
+		if [[ "${CHOST}" == x86_64-pc-linux-gnu ]]; then
+			cat <<EOF
+
+Normally I can only give you ~amd64 packages, and you would be exposed
+to all the bugs of the newest untested software.  Well, ok, sometimes
+it also has new features, but who needs those.  But as you are a VIP
+customer who uses Linux on x86_64, I have a one-time offer for you!
+I can limit your Prefix to use only packages keyworded for stable amd64
+by default.  Of course, you can still enable testing ~amd64 for
+the packages you want, when the need arises.
+EOF
+			[[ ${TODO} == 'noninteractive' ]] && ans=yes ||
+			read -p "  Do you want to use stable Prefix? [Yn] " ans
+			case "${ans}" in
+				[Yy][Ee][Ss]|[Yy]|"")
+					echo "Okay, I'll disable ~amd64 by default."
+					export STABLE_PREFIX="yes"
+					: ;;
+				*)
+					echo "Fine, I will not disable ~amd64, no problem."
+					;;
+			esac
+		fi
+	fi
+
 	# choose EPREFIX, we do this last, since we have to actually write
 	# to the filesystem here to check that the EPREFIX is sane
 	cat << EOF

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     817c8614fec20221ddedadd02d9325b51c525e99
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 21 06:18:30 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 06:18:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=817c8614

scripts/bootstrap-prefix: bootstrap with newer Portage for EAPI=8

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c34842da77..03f385c667 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -610,8 +610,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="3.0.12.0.2"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.12.0.2"
+	STABLE_PV="3.0.21"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.21"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%.tar.*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8170b99f5c3d2bd795c60f72064ab70f2f2ced35
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 22 05:25:23 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 05:25:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8170b99f

scripts/bootstrap-prefix: bump snapshot for newer Portage

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 03f385c667..82d82bed61 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -543,7 +543,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210213"
+	local PV="20210821"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     369152c566d4b0efe6dec6eee19cd6655c19d1b1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 23 06:18:01 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug 23 06:18:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=369152c5

scripts/bootstrap-prefix: bump snapshot for unmasked findutils

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 82d82bed61..187673e29b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -543,7 +543,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210821"
+	local PV="20210822"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     05f877feef115ca704804dc635b6621866650ba7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 23 16:46:42 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug 23 16:46:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=05f877fe

scripts/bootstrap-prefix: set GENTOO_MIRRORS in make.conf

Add the Prefix distfile mirror by default, so "outdated" ebuilds from
the overlay will remain fetchable for new installs.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 187673e29b..aaff67bfe4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -324,6 +324,10 @@ bootstrap_setup() {
 				# bug 759424
 				[[ -n ${STABLE_PREFIX} ]] && \
 					echo 'ACCEPT_KEYWORDS="${ARCH} -~${ARCH}"'
+			else
+				echo "# last mirror is for Prefix specific distfiles, you"
+				echo "# might experience fetch failures if you remove it"
+				echo "GENTOO_MIRRORS=\"${GENTOO_MIRRORS} ${DISTFILES_PFX}\""
 			fi
 			if [[ ${FS_INSENSITIVE} == 1 ]] ; then
 				echo

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     5d11b2898eb984ab1c1986beb512fc54d2b18107
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 14 18:10:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 14 18:10:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5d11b289

bootstap-prefix.sh: disable sanitize on GCC

Avoids needing libcrypt early on.

Closes: https://bugs.gentoo.org/817974
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index aaff67bfe4..570ca048a7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1609,6 +1609,7 @@ do_emerge_pkgs() {
 			-python
 			-qmanifest -qtegrity
 			-readline
+			-sanitize
 			bootstrap
 			clang
 			internal-glib

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     d9eb358d6802608eb16358b6efc394045876b196
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 14 18:29:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 14 18:30:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d9eb358d

bootstrap-prefix.sh: add libxcrypt to core package list

We need to emerge libxcrypt before trying to install
@world properly to avoid circular dependencies
between libxcrypt, perl, and glibc.

Bug: https://bugs.gentoo.org/817974
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 570ca048a7..59f286384b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2010,6 +2010,7 @@ bootstrap_stage3() {
 		pkgs=(
 			sys-apps/attr
 			sys-libs/libcap
+			sys-libs/libxcrypt
 		)
 		BOOTSTRAP_RAP=yes \
 		USE="${USE} -pam" \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     17dd90017df422633ffbb32cbbbc00ceeadef47c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 15 06:02:02 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Oct 15 06:02:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=17dd9001

scripts/bootstrap=prefix: bump snapshot for sys-devel/gcc fixes

Bug: https://bugs.gentoo.org/812278
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 59f286384b..ec489f1f26 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -547,7 +547,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20210822"
+	local PV="20211014"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Guilherme Amadio]

commit:     d39c38ea123c5eaea7f06c1cde0a47ec4d58807d
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 28 11:22:42 2021 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Oct 28 11:22:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d39c38ea

bootstrap-prefix.sh: fix RAP bootstrap with non-local user, bug 766417

When the bootstrapping user is handled by Kerberos and is not local to
the host, the libc from prefix doesn't know how to convert usernames
to user ids, which ends up confusing portage. Using getent from the host
to add the bootstrapping user to ${EPREFIX}/etc/passwd works around this
issue.

Closes: https://bugs.gentoo.org/766417
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ec489f1f26..0e21c83953 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -344,10 +344,24 @@ bootstrap_setup() {
 	fi
 
 	if is-rap ; then
-		[[ -f ${ROOT}/etc/passwd ]] || getent passwd > "${ROOT}"/etc/passwd || \
-			ln -sf {,"${ROOT}"}/etc/passwd
-		[[ -f ${ROOT}/etc/group ]] || getent group > "${ROOT}"/etc/group || \
-			ln -sf {,"${ROOT}"}/etc/group
+		if [[ ! -f ${ROOT}/etc/passwd ]]; then
+			if grep -q $(id -un) /etc/passwd; then
+				ln -sf {,"${ROOT}"}/etc/passwd
+			else
+				getent passwd > "${ROOT}"/etc/passwd
+				# add user if it's not in /etc/passwd, bug 766417
+				getent passwd $(id -un) >> "${ROOT}"/etc/passwd
+			fi
+		fi
+		if [[ ! -f ${ROOT}/etc/group ]]; then
+			if grep -q $(id -gn) /etc/group; then
+				ln -sf {,"${ROOT}"}/etc/group
+			else
+				getent group > "${ROOT}"/etc/group
+				# add group if it's not in /etc/group, bug 766417
+				getent group $(id -gn) >> "${ROOT}"/etc/group
+			fi
+		fi
 		[[ -f ${ROOT}/etc/resolv.conf ]] || ln -s {,"${ROOT}"}/etc/resolv.conf
 		[[ -f ${ROOT}/etc/hosts ]] || cp {,"${ROOT}"}/etc/hosts
 		local profile_linux=default/linux/ARCH/17.0/prefix/$(profile-kernel)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     fb744a61aa7008a80ae0a3d0b9fbde8a1fe99aa7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  2 15:33:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  2 15:33:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fb744a61

scripts/bootstrap-prefix.sh: adapt for macOS 12 Monterey

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0e21c83953..11a042315b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -382,15 +382,25 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
-		x86_64-apple-darwin2[0123456789])
+		x86_64-apple-darwin20)
 			# Big Sur is 11.0
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/11.$((rev - 20))/x64"
 			;;
-		arm64-apple-darwin2[0123456789])
+		x86_64-apple-darwin2[123456789])
+			# Monterey is 12.0
+			rev=${CHOST##*darwin}
+			profile="prefix/darwin/macos/12.$((rev - 20))/x64"
+			;;
+		arm64-apple-darwin20)
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/11.$((rev - 20))/arm64"
 			;;
+		x86_64-apple-darwin2[123456789])
+			# Monterey is 12.0
+			rev=${CHOST##*darwin}
+			profile="prefix/darwin/macos/12.$((rev - 20))/x64"
+			;;
 		i*86-pc-linux-gnu)
 			profile=${profile_linux/ARCH/x86}
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     3514dcddc225dd2170cd162d1d68165995eedf8e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  3 03:22:52 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov  3 03:22:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3514dcdd

bootstrap-prefix.sh: fix typo in profile

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 11a042315b..cbe4aa6543 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -390,7 +390,7 @@ bootstrap_setup() {
 		x86_64-apple-darwin2[123456789])
 			# Monterey is 12.0
 			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/12.$((rev - 20))/x64"
+			profile="prefix/darwin/macos/12.$((rev - 21))/x64"
 			;;
 		arm64-apple-darwin20)
 			rev=${CHOST##*darwin}
@@ -399,7 +399,7 @@ bootstrap_setup() {
 		x86_64-apple-darwin2[123456789])
 			# Monterey is 12.0
 			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/12.$((rev - 20))/x64"
+			profile="prefix/darwin/macos/12.$((rev - 21))/x64"
 			;;
 		i*86-pc-linux-gnu)
 			profile=${profile_linux/ARCH/x86}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     a21d106400cb57ad52244c29975e439d4301a716
Author:     Brad Laue <brad <AT> brad-x <DOT> com>
AuthorDate: Thu Nov  4 23:15:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 23:29:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a21d1064

Use --deep and --newuse on final @system build

To capture dependency updates and build with updated USE flags prior to emerge
-e system - will avoid potential unresolved dependency situations.

[sam: ... and avoid needing to rbeuild stuff just after we've built
everything *again.*]

Closes: https://github.com/gentoo/prefix/pull/4
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cbe4aa6543..44d8935c1f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2162,10 +2162,10 @@ bootstrap_stage3() {
 	# Avoid glib compiling for Cocoa libs if it finds them, since we're
 	# still with an old llvm that may not understand the system headers
 	# very well on Darwin (-DGNUSTEP_BASE_VERSION hack)
-	einfo "running emerge -u system"
-	estatus "stage3: emerge -u system"
+	einfo "running emerge -uDNav system"
+	estatus "stage3: emerge -uDNav system"
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
-	CFLAGS= CXXFLAGS= emerge --color n -u -v system || return 1
+	CFLAGS= CXXFLAGS= emerge --color n -uDNav system || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     41dbf29061887de65341151ac31f28eaa77f7b45
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  6 08:39:41 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov  6 08:40:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=41dbf290

scripts/bootstrap-prefix: bump snapshot for Monterey

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 44d8935c1f..e2e3787075 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -571,7 +571,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20211014"
+	local PV="20211105"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     48ba69b1bbb0497a3fc02c55309a3fec6b5c5079
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 04:10:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 04:10:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=48ba69b1

scripts/bootstrap-prefix.sh: update for macOS 12 for arm64

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e2e3787075..825aa87c5e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -396,11 +396,17 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/11.$((rev - 20))/arm64"
 			;;
+		# TODO: Come up with something better for macOS 11+
 		x86_64-apple-darwin2[123456789])
 			# Monterey is 12.0
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/12.$((rev - 21))/x64"
 			;;
+		arm64-apple-darwin2[123456789])
+			# Monterey is 12.0
+			rev=${CHOST##*darwin}
+			profile="prefix/darwin/macos/12.$((rev - 21))/arm64"
+			;;
 		i*86-pc-linux-gnu)
 			profile=${profile_linux/ARCH/x86}
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     c7a36d05a3ef1850bb4e4edcaedae88ec1b263ba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 05:56:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 05:56:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c7a36d05

scripts/bootstrap-prefix.sh: swap to Python 3.9 for bootstrap

1. ::gentoo defaults to Python 3.9 for quite some time (and
   going against the profile defaults leads to possible
   missing deps/hiccups).

2. This seems to help with some failures when poking at
   Clang-based bootstrap for macOS/Darwin.

Succesfully bootstrapped on x86_64-apple-darwin21-gcc.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 825aa87c5e..e1ceee9d37 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -979,9 +979,9 @@ bootstrap_gnu() {
 	einfo "${A%.tar.*} successfully bootstrapped"
 }
 
-PYTHONMAJMIN=3.8   # keep this number in line with PV below for stage1,2
+PYTHONMAJMIN=3.9   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-	PV=3.8.6
+	PV=3.9.6
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 
@@ -1047,8 +1047,8 @@ bootstrap_python() {
 			-e 's/KQUEUE/KQUEUE_DISABLED/' \
 			configure
 		# fixup thread id detection
-		efetch "http://dev.gentoo.org/~grobian/distfiles/python-3.8.6-darwin9.patch"
-		patch -p1 < "${DISTDIR}"/python-3.8.6-darwin9.patch
+		efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch"
+		patch -p1 < "${DISTDIR}"/python-3.9.6-darwin9_pthreadid.patch
 		;;
 	(arm64-*-darwin*)
 		# Teach Python a new trick (arm64)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     7b7be0a2a9826019425b2efea9be6aa880b1f62d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 07:56:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 07:56:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7b7be0a2

scripts/bootstrap-prefix.sh: tidy up whitespace

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e1ceee9d37..65f56ab99b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -105,7 +105,7 @@ efetch() {
 
 configure_cflags() {
 	export CPPFLAGS="-I${ROOT}/tmp/usr/include"
-	
+
 	case ${CHOST} in
 		*-darwin*)
 			export LDFLAGS="-Wl,-search_paths_first -L${ROOT}/tmp/usr/lib"
@@ -203,9 +203,9 @@ configure_toolchain() {
 					;;
 				*"Apple clang version "*|*"Apple LLVM version "*)
 					# recent binutils-apple are hard to build (C++11
-					# features, and cmake buildsystem) so avoid going
+					# features, and cmake build system) so avoid going
 					# there, the system ld is good enough to bring us to
-					# stage3, after which system set will take care of
+					# stage3, after which the @system set will take care of
 					# the rest
 					linker=sys-devel/native-cctools
 					;;
@@ -319,9 +319,9 @@ bootstrap_setup() {
 			echo "CONFIG_SHELL=\"${ROOT}/bin/bash\""
 			echo "DISTDIR=\"${DISTDIR:-${ROOT}/var/cache/distfiles}\""
 			if is-rap ; then
-				echo "# sandbox does not work well on Prefix, bug 490246"
+				echo "# sandbox does not work well on Prefix, bug #490246"
 				echo 'FEATURES="${FEATURES} -usersandbox -sandbox"'
-				# bug 759424
+				# bug #759424
 				[[ -n ${STABLE_PREFIX} ]] && \
 					echo 'ACCEPT_KEYWORDS="${ARCH} -~${ARCH}"'
 			else
@@ -349,7 +349,7 @@ bootstrap_setup() {
 				ln -sf {,"${ROOT}"}/etc/passwd
 			else
 				getent passwd > "${ROOT}"/etc/passwd
-				# add user if it's not in /etc/passwd, bug 766417
+				# add user if it's not in /etc/passwd, bug #766417
 				getent passwd $(id -un) >> "${ROOT}"/etc/passwd
 			fi
 		fi
@@ -358,7 +358,7 @@ bootstrap_setup() {
 				ln -sf {,"${ROOT}"}/etc/group
 			else
 				getent group > "${ROOT}"/etc/group
-				# add group if it's not in /etc/group, bug 766417
+				# add group if it's not in /etc/group, bug #766417
 				getent group $(id -gn) >> "${ROOT}"/etc/group
 			fi
 		fi
@@ -447,7 +447,7 @@ bootstrap_setup() {
 		x86_64-pc-cygwin*)
 			profile="prefix/windows/cygwin/x64"
 			;;
-		*)	
+		*)
 			eerror "UNKNOWN ARCH: You need to set up a make.profile symlink to a"
 			eerror "profile in ${PORTDIR} for your CHOST ${CHOST}"
 			exit 1
@@ -477,7 +477,7 @@ bootstrap_setup() {
 	profile=${PROFILE_BASE:-prefix}/${profile#prefix/}${PROFILE_VARIANT:+/${PROFILE_VARIANT}}
 	if [[ -n ${profile} && ! -e ${ROOT}/etc/portage/make.profile ]] ; then
 		local fullprofile="${PORTDIR}/profiles/${profile}"
-		
+
 		ln -s "${fullprofile}" "${ROOT}"/etc/portage/make.profile
 		einfo "Your profile is set to ${fullprofile}."
 	fi
@@ -649,7 +649,7 @@ bootstrap_portage() {
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%.tar.*}"
-		
+
 	efetch ${DISTFILES_URL}/${A} || return 1
 
 	einfo "Unpacking ${A%.tar.*}"
@@ -698,7 +698,7 @@ bootstrap_portage() {
 	cd "${ROOT}"
 	rm -Rf ${ptmp} >& /dev/null
 
-	# Some people will skip the tree() step and hence var/log is not created 
+	# Some people will skip the tree() step and hence var/log is not created
 	# As such, portage complains..
 	mkdir -p "${ROOT}"/tmp/var/log
 
@@ -1190,7 +1190,7 @@ bootstrap_cmake_core() {
 	emake install || return 1
 
 	# we need sysroot crap to build cmake itself, but it makes trouble
-	# lateron, so kill it in the installed version
+	# later on, so kill it in the installed version
 	ver=${A%-*} ; ver=${ver%.*}
 	sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
 		"${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-GNU-*.cmake || die
@@ -1402,7 +1402,7 @@ bootstrap_stage_host_gentoo() {
 		einfo "are bootstrapping prefix-rpath.  Do nothing."
 		return 0
 	fi
-	
+
 	if [[ ! -L ${ROOT}/tmp ]] ; then
 		if [[ -e ${ROOT}/tmp ]] ; then
 			einfo "${ROOT}/tmp exists and is not a symlink to ${HOST_GENTOO_EROOT}"
@@ -2080,7 +2080,7 @@ bootstrap_stage3() {
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python${PYTHONMAJMIN}/site-packages/clang
 
-	# try to get ourself out of the mudd, bug #575324
+	# try to get ourself out of the mud, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto --disable-bootstrap')" \
 	GCC_MAKE_TARGET=$(rapx all) \
 	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     a3175e08822394188b112dc5e23475e876cd603e
Author:     Brad Laue <brad <AT> brad-x <DOT> com>
AuthorDate: Wed Nov 10 15:10:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 03:34:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a3175e08

scripts/bootstrap-prefix.sh: don't unset *FLAGS for stage3 @system

Unsetting CFLAGS and CXXFLAGS by stage3 breaks builds.

[sam: We're pulling in more packages now, which is probably why this
never showed up before.]

Closes: https://github.com/gentoo/prefix/pull/5
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 65f56ab99b..ece81d3791 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2171,7 +2171,7 @@ bootstrap_stage3() {
 	einfo "running emerge -uDNav system"
 	estatus "stage3: emerge -uDNav system"
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
-	CFLAGS= CXXFLAGS= emerge --color n -uDNav system || return 1
+	emerge --color n -uDNav system || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     503cfcdf2f49a3b450d5828b1b3ad0d70ac0688e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 13 11:04:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 11:04:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=503cfcdf

Revert "scripts/bootstrap-prefix.sh: don't unset *FLAGS for stage3 @system"

Need to discuss this more with grobian, but I'd misunderstood
where we do this (it's _before_ the -e @system, not _after_,
so it's not like it's just before the user might update
their system anyway).

coreutils (and possibly libtasn1) are still broken but
I'm not convinced this is the right fix after grobian@
raised concerns.

Will revisit shortly but reverting for now to avoid
problems.

This reverts commit a3175e08822394188b112dc5e23475e876cd603e.

Bug: https://github.com/gentoo/prefix/pull/5
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ece81d3791..65f56ab99b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2171,7 +2171,7 @@ bootstrap_stage3() {
 	einfo "running emerge -uDNav system"
 	estatus "stage3: emerge -uDNav system"
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
-	emerge --color n -uDNav system || return 1
+	CFLAGS= CXXFLAGS= emerge --color n -uDNav system || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     61d84484156aca4c9f0613ce15a75b8e925ba11d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 13:33:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 13:33:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=61d84484

scripts/bootstrap-prefix.sh: don't use --ask in emerge ... @system call

Reported-by: Guilherme Amadio <amadio <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 65f56ab99b..1c6c42dad6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2168,10 +2168,10 @@ bootstrap_stage3() {
 	# Avoid glib compiling for Cocoa libs if it finds them, since we're
 	# still with an old llvm that may not understand the system headers
 	# very well on Darwin (-DGNUSTEP_BASE_VERSION hack)
-	einfo "running emerge -uDNav system"
-	estatus "stage3: emerge -uDNav system"
+	einfo "running emerge -uDNv system"
+	estatus "stage3: emerge -uDNv system"
 	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
-	CFLAGS= CXXFLAGS= emerge --color n -uDNav system || return 1
+	CFLAGS= CXXFLAGS= emerge --color n -uDNv system || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     bc9fc5509ac815945e287ef70e89cb21b34808fc
Author:     Etienne Buira <etienne.buira.lists <AT> free <DOT> fr>
AuthorDate: Sat Dec  4 07:53:26 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 13:42:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bc9fc550

scripts/bootstrap-prefix: bugfix: use given EPREFIX

Using $1 should not be reserved to uninteractive

v2:
  - leave some comment
  - not moved down, because the following environment sanitiser unsets
    $ROOT
  - shortened $subject

Thanks grobian for review

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1c6c42dad6..a2b1db7235 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2322,9 +2322,8 @@ EOF
 	echo
 	echo "It seems to me you are '${USER:-$(whoami 2> /dev/null)}' (${UID}), that looks cool to me."
 
-	# Expect noninteractive users to know what they do:
-	# Take EPREFIX from argv1 (=ROOT), not from env var.
-	[[ ${TODO} == 'noninteractive' ]] && EPREFIX=${ROOT}
+	# In case $ROOT were specified as $1, use it
+	[[ -z "${EPREFIX}" ]] && EPREFIX="${ROOT}"
 
 	echo
 	echo "I'm going to check for some variables in your environment now:"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a0fe6cc7412011a7d345068e82fcda1a249d85e1
Author:     Etienne Buira <etienne.buira.lists <AT> free <DOT> fr>
AuthorDate: Sat Dec  4 07:53:37 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 13:42:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a0fe6cc7

scripts/bootstrap-prefix.sh: cleanup

This dir is unconditionaly created a few lines above

v2:
  - shortened $subject

Thanks grobian for review

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a2b1db7235..4d345ad437 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -565,7 +565,6 @@ do_tree() {
 		else
 			efetch "$1/$2" || return 1
 		fi
-		[[ -e ${PORTDIR} ]] || mkdir -p ${PORTDIR}
 		einfo "Unpacking, this may take a while"
 		estatus "stage1: unpacking Portage tree"
 		bzip2 -dc ${DISTDIR}/$2 | \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     abad93d08ba1c08af8c7588d4a4915b111edace0
Author:     Etienne Buira <etienne.buira.lists <AT> free <DOT> fr>
AuthorDate: Sat Dec  4 07:53:50 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 13:42:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=abad93d0

scripts/bootstrap-prefix.sh: create etc/make.conf as dir

This makes it easy to (pre)set some site/host specific portage
configuration that will only get picked once portage is in shape enough
to run on its own, while letting bootstrap-prefix set its own settings.

v2:
  - added MAKE_CONF_DIR global helper variable
  - added local override var where appropriate
  - some reformating (not strictly adhering to 80 chars, but close to)
  - shortened $subject

Thanks grobian for review

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4d345ad437..e372fb21da 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -309,7 +309,8 @@ bootstrap_setup() {
 	[[ -e ${ROOT}/foo.$$ ]] && FS_INSENSITIVE=1
 	rm "${ROOT}"/FOO.$$
 
-	if [[ ! -f ${ROOT}/etc/portage/make.conf ]] ; then
+	[[ ! -e "${MAKE_CONF_DIR}" ]] && mkdir -p -- "${MAKE_CONF_DIR}"
+	if [[ ! -f ${ROOT}/etc/portage/make.conf/0100_bootstrap_prefix_make.conf ]] ; then
 		{
 			echo "# Added by bootstrap-prefix.sh for ${CHOST}"
 			echo 'USE="unicode nls"'
@@ -340,7 +341,7 @@ bootstrap_setup() {
 				echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
 			[[ ${OFFLINE_MODE} ]] && \
 				echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
-		} > "${ROOT}"/etc/portage/make.conf
+		} > "${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf"
 	fi
 
 	if is-rap ; then
@@ -1415,7 +1416,9 @@ bootstrap_stage_host_gentoo() {
 	(bootstrap_tree) || return 1
 
 	# setup a profile
-	[[ -e ${ROOT}/etc/portage/make.profile && -e ${ROOT}/etc/portage/make.conf ]] || (bootstrap_setup) || return 1
+	[[ -e ${ROOT}/etc/portage/make.profile && \
+		-e ${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf ]] \
+		|| (bootstrap_setup) || return 1
 
 	prepare_portage
 }
@@ -1574,7 +1577,9 @@ bootstrap_stage1() {
 	(bootstrap_tree) || return 1
 
 	# setup a profile
-	[[ -e ${ROOT}/etc/portage/make.profile && -e ${ROOT}/etc/portage/make.conf ]] || (bootstrap_setup) || return 1
+	[[ -e ${ROOT}/etc/portage/make.profile && \
+		-e ${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf ]] \
+		|| (bootstrap_setup) || return 1
 	mkdir -p "${ROOT}"/tmp/etc/. || return 1
 	[[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || cp -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc || return 1
 
@@ -1643,16 +1648,20 @@ do_emerge_pkgs() {
 			clang
 			internal-glib
 		)
+		local override_make_conf_dir=\
+			"${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf/"
+
 		if [[ " ${USE} " == *" prefix-stack "* ]] &&
 		   [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] &&
-		   ! grep -q '^USE=".*" # by bootstrap-prefix.sh$' "${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf"
+		   ! grep -Rq '^USE=".*" # by bootstrap-prefix.sh$' "${override_make_conf_dir}"
 		then
 			# With prefix-stack, the USE env var does apply to the stacked
 			# prefix only, not the base prefix (any more? since some portage
 			# version?), so we have to persist the base USE flags into the
 			# base prefix - without the additional incoming USE flags.
+			mkdir -p -- "${override_make_conf_dir}"
 			echo "USE=\"\${USE} ${myuse[*]}\" # by bootstrap-prefix.sh" \
-				>> "${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf"
+				>> "${override_make_conf_dir}/0101_bootstrap_prefix_stack.conf"
 		fi
 		myuse=" ${myuse[*]} "
 		local use
@@ -1843,6 +1852,7 @@ bootstrap_stage2() {
 	if [[ ${compiler_type} == clang ]] ; then
 		# we use Clang as our toolchain compiler, so we need to make
 		# sure we actually use it
+		mkdir -p -- "${MAKE_CONF_DIR}"
 		{
 			echo
 			echo "# System compiler on $(uname) Prefix is Clang, do not remove this"
@@ -1852,7 +1862,7 @@ bootstrap_stage2() {
 			echo "OBJCXX=${CHOST}-clang++"
 			echo "BUILD_CC=${CHOST}-clang"
 			echo "BUILD_CXX=${CHOST}-clang++"
-		} >> "${ROOT}"/etc/portage/make.conf
+		} >> "${MAKE_CONF_DIR}/0100_bootstrap_prefix_clang.conf"
 		# llvm won't setup symlinks to CHOST-clang here because
 		# we're in a cross-ish situation (at least according to
 		# multilib.eclass -- can't blame it at this point really)
@@ -2197,6 +2207,7 @@ set_helper_vars() {
 	export PORTDIR=${PORTDIR:-"${ROOT}/var/db/repos/gentoo"}
 	export DISTDIR=${DISTDIR:-"${ROOT}/var/cache/distfiles"}
 	PORTAGE_TMPDIR=${PORTAGE_TMPDIR:-${ROOT}/var/tmp}
+	MAKE_CONF_DIR="${ROOT}/etc/portage/make.conf/"
 	DISTFILES_URL=${DISTFILES_URL:-"http://dev.gentoo.org/~grobian/distfiles"}
 	GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"}
 	DISTFILES_G_O="http://distfiles.prefix.bitzolder.nl"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     131a48fda39fb846922d0e521695b5e5a77f4fb4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 13:46:44 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 13:46:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=131a48fd

scripts/bootstrap-prefix: use MAKE_CONF_DIR where possible

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e372fb21da..04a6ef37b1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -310,7 +310,7 @@ bootstrap_setup() {
 	rm "${ROOT}"/FOO.$$
 
 	[[ ! -e "${MAKE_CONF_DIR}" ]] && mkdir -p -- "${MAKE_CONF_DIR}"
-	if [[ ! -f ${ROOT}/etc/portage/make.conf/0100_bootstrap_prefix_make.conf ]] ; then
+	if [[ ! -f ${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf ]] ; then
 		{
 			echo "# Added by bootstrap-prefix.sh for ${CHOST}"
 			echo 'USE="unicode nls"'
@@ -1649,7 +1649,7 @@ do_emerge_pkgs() {
 			internal-glib
 		)
 		local override_make_conf_dir=\
-			"${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf/"
+			"${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}"
 
 		if [[ " ${USE} " == *" prefix-stack "* ]] &&
 		   [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] &&

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     46b44c2c2080582ca5c48925651ca385c233ffb8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  7 10:53:35 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec  7 10:53:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=46b44c2c

scripts/bootstrap-prefix.sh: fix errors recently introduced

./bootstrap-prefix.sh: line 1652: local: `ROOT/etc/portage/make.conf/': not a valid identifier

the assignment doesn't quite like it to be broken up like this, don't
know quite yet, but at least this fixes it

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 04a6ef37b1..ccbe9ef905 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1648,12 +1648,12 @@ do_emerge_pkgs() {
 			clang
 			internal-glib
 		)
-		local override_make_conf_dir=\
-			"${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}"
+		local override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}"
 
 		if [[ " ${USE} " == *" prefix-stack "* ]] &&
 		   [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] &&
-		   ! grep -Rq '^USE=".*" # by bootstrap-prefix.sh$' "${override_make_conf_dir}"
+		   ! grep -Rq '^USE=".*" # by bootstrap-prefix.sh$' \
+		   "${override_make_conf_dir}"
 		then
 			# With prefix-stack, the USE env var does apply to the stacked
 			# prefix only, not the base prefix (any more? since some portage

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     f1ba8d24da137ddcd0d0ba6c68d1f5e4b37635ef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 23:55:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 23:56:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f1ba8d24

scripts/bootstrap-prefix.sh: mask glibc-2.34 due to bootstrapping issues

Mask <sys-libs/glibc-2.34_p1 for now due to bootstrapping issues. Note that
_p1 doesn't exist but I wanted to use _something_ to allow us to push
glibc-2.34 to prefix users in future and _p1 is easier than guessing a revision.

We rarely use _pN in ::gentoo.

Bug: https://bugs.gentoo.org/824482
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ccbe9ef905..15ae679b95 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -494,6 +494,18 @@ bootstrap_setup() {
 	>=sys-devel/gcc-11
 	EOF
 
+	# bug #824482 avoid glibc-2.34
+	if is-rap; then
+		if ! [ -d "${ROOT}"/etc/portage/package.mask ]; then
+			mkdir "${ROOT}"/etc/portage/package.mask
+		fi
+		cat >> "${ROOT}"/etc/portage/package.mask/glibc <<-EOF
+		# Temporary mask for newer glibc until bootstrapping issues are fixed.
+		# bug #824482: Avoid glibc-2.34 for now.
+		<sys-libs/glibc-2.34_p1
+		EOF
+	fi
+
 	# Use package.use to disable in the portage tree to be shared between
 	# stage2 and stage3. The hack will be undone during tree sync in stage3.
 	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     baf039112b7a002a5ace1b6402413d6e923c1bae
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 08:07:24 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 08:07:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=baf03911

scripts/bootstrap-prefix: bump tree snapshot

get some fixes for Darwin9 bootstrap (ppc-macos)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2ac347383a..58cf0a47e6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -591,7 +591,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20211105"
+	local PV="20211227"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     abeaffc3e3c4916c60a197cce00ded2764007ca5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 08:02:36 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 08:02:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=abeaffc3

scripts/bootstrap-prefix: use <gcc-11 in stage1 on Darwin

GCC 11 needs a compiler with C++11 support, which is experimental in
4.8, e.g. not available in 4.2.1.  So bootstrap with 10.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 15ae679b95..2ac347383a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -214,7 +214,9 @@ configure_toolchain() {
 					return 1
 					;;
 			esac
-			compiler_stage1+=" sys-devel/gcc"
+			# current compiler (gcc-11 requires C++11, which is
+			# available since 4.8, so need to bootstrap with <11)
+			compiler_stage1+=" <sys-devel/gcc-11"
 			;;
 		*-darwin*)
 			einfo "Triggering Darwin with LLVM/Clang toolchain"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3ccb4f2dbb793844e0c1e9c9b940ad46826269b7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 30 10:42:52 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 30 10:42:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3ccb4f2d

stage3: emerge system with default CFLAGS iso empty

No reason to force C*FLAGS to empty values, just use the profile
defaults, like we did with all packages leading up to this final emerge.

Drop the GNUSTEP_BASE hack, it (hopefully is) obsolete by now.

This fixes a problem with libtasn1 where gnulib uses inlined symbols
that don't get inlined due to no optimisation in use (-O2 default from
profile), which results in non-external objects which cannot be resolved
by the linker eventually.  So while this problem is a real one, using
default CFLAGS fixes this (masks it, really), but this is a nice
side-effect from cleaning this up.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 58cf0a47e6..643d163211 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2188,13 +2188,12 @@ bootstrap_stage3() {
 	export USE="-git -crypt"
 
 	# Portage should figure out itself what it needs to do, if anything.
-	# Avoid glib compiling for Cocoa libs if it finds them, since we're
-	# still with an old llvm that may not understand the system headers
-	# very well on Darwin (-DGNUSTEP_BASE_VERSION hack)
 	einfo "running emerge -uDNv system"
 	estatus "stage3: emerge -uDNv system"
-	CPPFLAGS="-DGNUSTEP_BASE_VERSION" \
-	CFLAGS= CXXFLAGS= emerge --color n -uDNv system || return 1
+	(
+		unset CFLAGS CXXFLAGS CPPFLAGS
+		emerge --color n -uDNv system
+	) || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     99c4d68466e7f6c5f9e927eef423527778653e84
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 30 12:16:45 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 30 12:16:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=99c4d684

scripts/bootstrap-prefix: don't use subshell for emerge -u system

we don't have to restore C*FLAGS, this is the end of stage3

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 643d163211..70599da63a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2190,10 +2190,8 @@ bootstrap_stage3() {
 	# Portage should figure out itself what it needs to do, if anything.
 	einfo "running emerge -uDNv system"
 	estatus "stage3: emerge -uDNv system"
-	(
-		unset CFLAGS CXXFLAGS CPPFLAGS
-		emerge --color n -uDNv system
-	) || return 1
+	unset CFLAGS CXXFLAGS CPPFLAGS
+	emerge --color n -uDNv system || return 1
 
 	# remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     10324f2bc1807469a6425e308c9564ed8513f2fe
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 30 12:27:02 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 30 12:29:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=10324f2b

scripts/bootstrap-prefix: darwin-gcc: use gcc-10 with host gcc

GCC-11 needs C++11, which is at earliest in GCC-4.8, but if we bootstrap
from 4.2.1 (gcc-apple) we don't have this, so stick with GCC-10.  Avoid
upgrading immediately to 11 afterwards, because we'll recompile
everything lateron again.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 70599da63a..233f606caf 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -190,9 +190,11 @@ configure_toolchain() {
 			einfo "Triggering Darwin with GCC toolchain"
 			compiler_stage1+=" sys-apps/darwin-miscutils"
 			local ccvers="$(unset CHOST; /usr/bin/gcc --version 2>/dev/null)"
+			local isgcc=
 			case "${ccvers}" in
 				*"(GCC) 4.2.1 "*)
 					linker="=sys-devel/binutils-apple-3.2.6"
+					isgcc=true
 					;;
 				*"(GCC) 4.0.1 "*)
 					linker="=sys-devel/binutils-apple-3.2.6"
@@ -200,6 +202,7 @@ configure_toolchain() {
 					compiler_stage1+="
 						sys-devel/gcc-apple
 						=sys-devel/binutils-apple-3.2.6"
+					isgcc=true
 					;;
 				*"Apple clang version "*|*"Apple LLVM version "*)
 					# recent binutils-apple are hard to build (C++11
@@ -214,9 +217,15 @@ configure_toolchain() {
 					return 1
 					;;
 			esac
-			# current compiler (gcc-11 requires C++11, which is
-			# available since 4.8, so need to bootstrap with <11)
-			compiler_stage1+=" <sys-devel/gcc-11"
+			if [[ ${isgcc} == true ]] ; then
+				# current compiler (gcc-11) requires C++11, which is
+				# available since 4.8, so need to bootstrap with <11
+				compiler_stage1+=" <sys-devel/gcc-11"
+				compiler="${compiler%sys-devel/gcc} <sys-devel/gcc-11"
+			else
+				# assume LLVM/Clang has C++11 support
+				compiler_stage1+=" sys-devel/gcc"
+			fi
 			;;
 		*-darwin*)
 			einfo "Triggering Darwin with LLVM/Clang toolchain"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c7f2b0e464e4059bef08ea45faaf276e16695a07
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 17 07:15:53 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 17 07:15:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c7f2b0e4

scripts/bootstrap-prefix: bump snapshot and portage version

Bug: https://bugs.gentoo.org/831026
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 233f606caf..eecc8be6db 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -600,7 +600,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20211227"
+	local PV="20220116"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else
@@ -667,8 +667,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="3.0.21"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.21"
+	STABLE_PV="3.0.30.1"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.30.1"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%.tar.*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     8a6d831adcc3edc23c751d6fe6f600765bcc37b2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 18:51:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 18:51:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8a6d831a

scripts/bootstrap-prefix.sh: fix glibc mask/unmask logic

Closes: https://bugs.gentoo.org/824482
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index eecc8be6db..76383c0210 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -510,10 +510,21 @@ bootstrap_setup() {
 		if ! [ -d "${ROOT}"/etc/portage/package.mask ]; then
 			mkdir "${ROOT}"/etc/portage/package.mask
 		fi
+
+		if ! [ -d "${ROOT}"/etc/portage/package.unmask ]; then
+			mkdir "${ROOT}"/etc/portage/package.unmask
+		fi
+
 		cat >> "${ROOT}"/etc/portage/package.mask/glibc <<-EOF
 		# Temporary mask for newer glibc until bootstrapping issues are fixed.
-		# bug #824482: Avoid glibc-2.34 for now.
-		<sys-libs/glibc-2.34_p1
+		# bug #824482: Avoid glibc-2.34 for now. See package.unmask/glibc too.
+		>=sys-libs/glibc-2.34
+		EOF
+
+		cat >> "${ROOT}"/etc/portage/package.unmask/glibc <<-EOF
+		# Temporary mask for newer glibc until bootstrapping issues are fixed.
+		# bug #824482: Avoid glibc-2.34 for now. See package.mask/glibc too.
+		>=sys-libs/glibc-2.34_p1
 		EOF
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     52e3a39449c848016ac3e520b4ec80b6df06c89d
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Feb 19 15:34:21 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 16:08:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=52e3a394

script/bootstrap-prefix.sh: check PIPESTATUS on unpack

Both programs need to exit with status 0.

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 51 ++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 76383c0210..b8ad960e6d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -602,8 +602,8 @@ do_tree() {
 		fi
 		einfo "Unpacking, this may take a while"
 		estatus "stage1: unpacking Portage tree"
-		bzip2 -dc ${DISTDIR}/$2 | \
-			tar -xf - -C ${PORTDIR} --strip-components=1 || return 1
+		bzip2 -dc ${DISTDIR}/$2 | tar -xf - -C ${PORTDIR} --strip-components=1
+		[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 		touch ${PORTDIR}/.unpacked
 	fi
 }
@@ -692,7 +692,8 @@ bootstrap_portage() {
 	rm -rf "${S}" >& /dev/null
 	mkdir -p "${S}" >& /dev/null
 	cd "${S}"
-	bzip2 -dc "${DISTDIR}/${A}" | tar -xf - || return 1
+	bzip2 -dc "${DISTDIR}/${A}" | tar -xf -
+	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}/prefix-portage-${PV}"
 	cd "${S}"
 
@@ -787,7 +788,8 @@ bootstrap_simple() {
 		bz2)   decomp=bzip2 ;;
 		gz|"") decomp=gzip  ;;
 	esac
-	${decomp} -dc "${DISTDIR}"/${A} | tar -xf - || return 1
+	${decomp} -dc "${DISTDIR}"/${A} | tar -xf -
+	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/${PN}-${PV}
 	cd "${S}"
 
@@ -842,18 +844,21 @@ bootstrap_gnu() {
 		rm -rf "${S}"
 		mkdir -p "${S}"
 		cd "${S}"
-		if [[ ${t} == "tar.gz" ]] ; then
-			gzip -dc "${DISTDIR}"/${URL##*/} | tar -xf - || continue
-		elif [[ ${t} == "tar.xz" ]] ; then
-			xz -dc "${DISTDIR}"/${URL##*/} | tar -xf - || continue
-		elif [[ ${t} == "tar.bz2" ]] ; then
-			bzip2 -dc "${DISTDIR}"/${URL##*/} | tar -xf - || continue
-		elif [[ ${t} == "tar" ]] ; then
-			tar -xf "${DISTDIR}"/${A} || continue
-		else
-			einfo "unhandled extension: $t"
-			return 1
-		fi
+		case ${t} in
+			tar.xz)  decomp=xz    ;;
+			tar.bz2) decomp=bzip2 ;;
+			tar.gz)  decomp=gzip  ;;
+			tar)
+				tar -xf "${DISTDIR}"/${A} || continue
+				break
+				;;
+			*)
+				einfo "unhandled extension: $t"
+				return 1
+				;;
+		esac
+		${decomp} -dc "${DISTDIR}"/${URL##*/} | tar -xf -
+		[[ ${PIPESTATUS[*]} == '0 0' ]] || continue
 		break
 	done
 	S="${S}"/${PN}-${PV}
@@ -1202,7 +1207,8 @@ bootstrap_cmake_core() {
 	rm -rf "${S}"
 	mkdir -p "${S}"
 	cd "${S}"
-	gzip -dc "${DISTDIR}"/${A} | tar -xf - || return 1
+	gzip -dc "${DISTDIR}"/${A} | tar -xf -
+	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/cmake-${PV}
 	cd "${S}"
 
@@ -1253,11 +1259,12 @@ bootstrap_zlib_core() {
 	rm -rf "${S}"
 	mkdir -p "${S}"
 	cd "${S}"
-	if [[ ${A} == *.tar.gz ]] ; then
-		gzip -dc "${DISTDIR}"/${A} | tar -xf - || return 1
-	else
-		bzip2 -dc "${DISTDIR}"/${A} | tar -xf - || return 1
-	fi
+	case ${A} in
+		*.tar.gz) decomp=gzip  ;;
+		*)        decomp=bzip2 ;;
+	esac
+	${decomp} -dc "${DISTDIR}"/${A} | tar -xf -
+	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/zlib-${PV}
 	cd "${S}"
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     2132b7ef7c09b9ff17370f2c7759202fa94ff3d5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 17:26:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 17:26:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2132b7ef

bootstrap-prefix.sh: update copyright header

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b8ad960e6d..9bd38260ff 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2006-2021 Gentoo Authors; Distributed under the GPL v2
+# Copyright 2006-2022 Gentoo Authors; Distributed under the GPL v2
 
 trap 'exit 1' TERM KILL INT QUIT ABRT
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     387601ab22030d12bfa9cb819c6c88f10c28965e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 17:31:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 17:31:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=387601ab

bootstrap-prefix.sh: try m4 1.4.19 (for glibc-2.34 fix)

m4 1.4.19 has a glibc-2.34 fix we need to fix bootstraps w/ newer
glibc on host.

We don't apply older patches to this version but ew should fall back to 1.4.18
if the build fails anyway (the patches don't seem to be needed now, at least
the gnulib-ish one).

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a9b5635c4c..6bb4e5e439 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -913,13 +913,15 @@ bootstrap_gnu() {
 		# doesn't match
 		sed -i -e '/_GL_WARN_ON_USE (gets/d' lib/stdio.in.h lib/stdio.h
 
-		# macOS 10.13 have an issue with %n, which crashes m4
-		efetch "http://rsync.prefix.bitzolder.nl/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch" || return 1
-		patch -p1 < "${DISTDIR}"/m4-1.4.18-darwin17-printf-n.patch || return 1
-
-		# Bug 715880
-		efetch http://dev.gentoo.org/~heroxbd/m4-1.4.18-glibc228.patch || return 1
-		patch -p1 < "${DISTDIR}"/m4-1.4.18-glibc228.patch || return 1
+		if [[ ${PV} == "1.4.18" ]] ; then
+			# macOS 10.13 have an issue with %n, which crashes m4
+			efetch "http://rsync.prefix.bitzolder.nl/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch" || return 1
+			patch -p1 < "${DISTDIR}"/m4-1.4.18-darwin17-printf-n.patch || return 1
+
+			# Bug 715880
+			efetch http://dev.gentoo.org/~heroxbd/m4-1.4.18-glibc228.patch || return 1
+			patch -p1 < "${DISTDIR}"/m4-1.4.18-glibc228.patch || return 1
+		fi
 	fi
 
 	fix_config_sub
@@ -1413,7 +1415,7 @@ bootstrap_bison() {
 }
 
 bootstrap_m4() {
-	bootstrap_gnu m4 1.4.18 # version is patched, so beware
+	bootstrap_gnu m4 1.4.19 || bootstrap_gnu m4 1.4.18 # version is patched, so beware
 }
 
 bootstrap_gzip() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     ee38c91b0b63968dcc026b167523842e8cb26fc8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 17:26:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 17:26:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ee38c91b

bootstrap-prefix.sh: try coreutils 8.32 for bootstrap

Fixed a build failure in #gentoo-prefix when someone
was attempting w/ FreeBSD.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9bd38260ff..a9b5635c4c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1362,7 +1362,7 @@ bootstrap_coreutils() {
 	# 8.16 is the last version released as tar.gz
 	# 8.18 is necessary for macOS High Sierra (darwin17) and converted
 	#      to tar.gz for this case
-	bootstrap_gnu coreutils 8.30 || \
+	bootstrap_gnu coreutils 8.32 || bootstrap_gnu coreutils 8.30 || \
 	bootstrap_gnu coreutils 8.16 || bootstrap_gnu coreutils 8.17
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0f7acc18b45869d9a523a3fdb653199450c89959
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 11:09:34 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 31 11:09:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0f7acc18

scripts/bootstrap-prefix: get a working bootstrapped bash on musl systems

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6bb4e5e439..3b5d911680 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -944,6 +944,11 @@ bootstrap_gnu() {
 	[[ ${PN} == "bash" && ${CHOST} != *-cygwin* ]] \
 		&& myconf="${myconf} --disable-readline"
 
+	# on e.g. musl systems bash will crash with a malloc error if we use
+	# bash' internal malloc, so disable it during it this stage
+	[[ ${PN} == "bash" ]] && \
+		myconf="${myconf} --without-bash-malloc"
+
 	# ensure we don't read system-wide shell initialisation, it may
 	# contain cruft, bug #650284
 	[[ ${PN} == "bash" ]] && \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5d8daa635220d6ac96f5891c8b46fd815f7c8082
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 06:41:48 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 06:41:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5d8daa63

scripts/bootstrap-prefix: try and detect musl libc on Linux

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 3b5d911680..dc78743b93 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3140,15 +3140,18 @@ if [[ -z ${CHOST} ]]; then
 	if [[ x$(type -t uname) == "xfile" ]]; then
 		case `uname -s` in
 			Linux)
+				plt="gnu"
+				[[ -e /lib/ld-musl-*.so.1 ]] && plt="musl"
+				sfx="unknown-linux-${plt}"
 				case `uname -m` in
 					ppc*)
-						CHOST="`uname -m | sed -e 's/^ppc/powerpc/'`-unknown-linux-gnu"
+						CHOST="`uname -m | sed -e 's/^ppc/powerpc/'`-${sfx}"
 						;;
 					powerpc*|aarch64*)
-						CHOST="`uname -m`-unknown-linux-gnu"
+						CHOST="`uname -m`-${sfx}"
 						;;
 					*)
-						CHOST="`uname -m`-pc-linux-gnu"
+						CHOST="`uname -m`-${sfx/unknown/pc}"
 						;;
 				esac
 				;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     77970d2b6d1d4fc05b68252a0ede211800be067c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 07:01:04 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 07:01:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=77970d2b

scripts/bootstrap-prefix: bump snapshot for gcc-12.1.0

Our GCC 12.1 snapshot is prepped for Apple M1 support, preparing the way
for a full arm64-darwin bootstrap.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index dc78743b93..c242762d33 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -611,7 +611,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20220116"
+	local PV="20220616"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     dfde00ac12aa53f5a95069227440f3f6c1eb5123
Author:     Atharva <atharvaamritkar <AT> protonmail <DOT> com>
AuthorDate: Wed Jun  1 05:01:42 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 06:08:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dfde00ac

bootstrap-prefix.sh: adding riscv profile

Signed-off-by: Atharva <atharvaamritkar <AT> protonmail.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c242762d33..519f356d87 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -422,6 +422,9 @@ bootstrap_setup() {
 		i*86-pc-linux-gnu)
 			profile=${profile_linux/ARCH/x86}
 			;;
+		riscv64-pc-linux-gnu)
+			profile=${profile_linux/ARCH/riscv}
+			;;	
 		x86_64-pc-linux-gnu)
 			profile=${profile_linux/ARCH/amd64}
 			profile=${profile/17.0/17.1/no-multilib}
@@ -435,6 +438,9 @@ bootstrap_setup() {
 		powerpc64le-unknown-linux-gnu)
 			profile=${profile_linux/ARCH/ppc64le}
 			;;
+		riscv-pc-unknown-linux-gnu)
+			profile=${profile_linux/ARCH/riscv}	
+			;;
 		aarch64-unknown-linux-gnu)
 			profile=${profile_linux/ARCH/arm64}
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     55f28d1b78ff6c67d52fa78eaf12d81fdce23897
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jun  4 04:19:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 16:28:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=55f28d1b

scripts/bootstrap-prefix.sh: add OpenBSD toolchain

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f1eecd65bc..906ce86bc7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -160,7 +160,7 @@ configure_toolchain() {
 	*-darwin*)
 	  # handled below
 	  ;;
-	*-freebsd*)
+	*-freebsd* | *-openbsd*)
 	  # comes with clang, handled below
 	  ;;
 	*)
@@ -267,7 +267,7 @@ configure_toolchain() {
 				sys-devel/llvm
 				sys-devel/clang"
 			;;
-		*-freebsd*)
+		*-freebsd* | *-openbsd*)
 			CC=clang
 			CXX=clang++
 			# TODO: target clang toolchain someday?

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     21de97a13101b3195ee0acf8d9652d2471fe7d23
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jun  4 04:20:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 16:28:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=21de97a1

scripts/bootstrap-prefix.sh: enable ncpu detection for OpenBSD

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 906ce86bc7..c7de6d7ec7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2632,12 +2632,18 @@ EOF
 	echo
 	local ncpu=
 	case "${CHOST}" in
-		*-cygwin*)     ncpu=$(cmd /D /Q /C 'echo %NUMBER_OF_PROCESSORS%' | tr -d "\\r") ;;
-		*-darwin*)     ncpu=$(/usr/sbin/sysctl -n hw.ncpu)                 ;;
-		*-freebsd*)    ncpu=$(/sbin/sysctl -n hw.ncpu)                     ;;
-		*-solaris*)    ncpu=$(/usr/sbin/psrinfo | wc -l)                   ;;
-		*-linux-gnu*)  ncpu=$(cat /proc/cpuinfo | grep processor | wc -l)  ;;
-		*)             ncpu=1                                              ;;
+		*-cygwin*)
+			ncpu=$(cmd /D /Q /C 'echo %NUMBER_OF_PROCESSORS%' | tr -d "\\r") ;;
+		*-darwin*)
+			ncpu=$(/usr/sbin/sysctl -n hw.ncpu) ;;
+		*-freebsd* | *-openbsd*)
+			ncpu=$(/sbin/sysctl -n hw.ncpu) ;;
+		*-solaris*)
+			ncpu=$(/usr/sbin/psrinfo | wc -l) ;;
+		*-linux-gnu*)
+			ncpu=$(cat /proc/cpuinfo | grep processor | wc -l) ;;
+		*)
+			ncpu=1 ;;
 	esac
 	# get rid of excess spaces (at least Solaris wc does)
 	ncpu=$((ncpu + 0))

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     16089d5cef7ce3a9f636f22fdd9b2a0dbb373322
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jun  4 04:22:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 16:28:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=16089d5c

scripts/bootstrap-prefix.sh: fix bash build on OpenBSD

SYS_BASHRC must be a string, not a multi-character constant.
https://lists.gnu.org/archive/html/bug-bash/2022-06/msg00015.html

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f14872f6d5..1ab204b0e9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -959,8 +959,9 @@ bootstrap_gnu() {
 	# contain cruft, bug #650284
 	[[ ${PN} == "bash" ]] && \
 		export CPPFLAGS="${CPPFLAGS} \
-			-DSYS_BASHRC=\'\"${ROOT}/etc/bash/bashrc\"\' \
-			-DSYS_BASH_LOGOUT=\'\"${ROOT}/etc/bash/bash_logout\"\'"
+			-DSYS_BASHRC=\\\"${ROOT}/etc/bash/bashrc\\\" \
+			-DSYS_BASH_LOGOUT=\\\"${ROOT}/etc/bash/bash_logout\\\" \
+		"
 
 	# Don't do ACL stuff on Darwin, especially Darwin9 will make
 	# coreutils completely useless (install failing on everything)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     10e787dc1e98652ef5c77f3da33335f003e68115
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jun  4 04:20:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 16:28:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=10e787dc

scripts/bootstrap-prefix.sh: use BSD stat syntax for OpenBSD

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c7de6d7ec7..f14872f6d5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2901,8 +2901,8 @@ EOF
 		# GNU and BSD variants of stat take different arguments (and
 		# format specifiers are not equivalent)
 		case "${CHOST}" in
-			*-darwin* | *-freebsd*) STAT='stat -f %u/%g' ;;
-			*)                      STAT='stat -c %U/%G' ;;
+			*-darwin* | *-freebsd* | *-openbsd*) STAT='stat -f %u/%g' ;;
+			*)                                   STAT='stat -c %U/%G' ;;
 		esac
 
 		if [[ $(${STAT} "${EPREFIX}"/.canihaswrite) != \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     27752a65da927fadd7aac5ac18c5e8797c4e015f
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jun  4 04:17:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 16:28:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=27752a65

scripts/bootstrap-prefix.sh: add OpenBSD CHOST detection

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 519f356d87..f1eecd65bc 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3195,6 +3195,13 @@ if [[ -z ${CHOST} ]]; then
 					;;
 				esac
 				;;
+			OpenBSD)
+				case `uname -m` in
+					amd64)
+						CHOST="x86_64-pc-openbsd`uname -r | sed 's|-.*$||'`"
+					;;
+				esac
+				;;
 			*)
 				eerror "Nothing known about platform `uname -s`."
 				eerror "Please set CHOST appropriately for your system"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     507f08372cb0fb882be36712f81111658591722a
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jun  4 04:22:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 16:28:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=507f0837

scripts/bootstrap-prefix.sh: fix Python build on OpenBSD

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1ab204b0e9..629fb6e3b3 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1109,6 +1109,13 @@ bootstrap_python() {
 			-e "/Unexpected output of 'arch' on OSX/d" \
 			configure
 		;;
+	(*-openbsd*)
+		# OpenBSD is not a multilib system
+		sed -i \
+			-e '0,/#if defined(__ANDROID__)/{s/ANDROID/OpenBSD/}' \
+			-e '0,/MULTIARCH=/{s/\(MULTIARCH\)=.*/\1=""/}' \
+			configure
+		;;
 	esac
 
 	case ${CHOST} in
@@ -1165,6 +1172,10 @@ bootstrap_python() {
 			LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}"
 			LDFLAGS="${LDFLAGS} -Wl,-rpath,${libdir#-L}"
 		;;
+		*-openbsd*)
+			# LLD
+			LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib"
+		;;
 		*-solaris*)
 			# Sun ld
 			LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/usr/lib ${libdir}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     894e06af34951af850f7a86acf427a6b3f82a5eb
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jun  4 04:23:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 16:28:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=894e06af

scripts/bootstrap-prefix.sh: use cp from GNU coreutils

BSD cp doesn't support "-d" flag.

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Closes: https://github.com/gentoo/prefix/pull/8
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 629fb6e3b3..9bcf8597f3 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1647,7 +1647,7 @@ bootstrap_stage1() {
 		-e ${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf ]] \
 		|| (bootstrap_setup) || return 1
 	mkdir -p "${ROOT}"/tmp/etc/. || return 1
-	[[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || cp -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc || return 1
+	[[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || "${ROOT}"/tmp/bin/cp -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc || return 1
 
 	# setup portage
 	[[ -e ${ROOT}/tmp/usr/bin/emerge ]] || (bootstrap_portage) || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     50e549dbc593ad3b7f936d503407caed1dc5b289
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Jun 30 12:08:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 12:17:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=50e549db

bootstrap-prefix.sh: fix build with system cp

Because of commit 894e06af34951af850f7a86acf427a6b3f82a5eb, the script
failed if bootstrap_coreutils step was not run.

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Closes: https://github.com/gentoo/prefix/pull/9
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9bcf8597f3..7421fa3f57 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1516,6 +1516,8 @@ bootstrap_stage1() {
 	# frequently pollute the environment using exports which affect
 	# packages following (e.g. zlib builds 64-bits)
 
+	local CP
+
 	# don't rely on $MAKE, if make == gmake packages that call 'make' fail
 	[[ -x ${ROOT}/tmp/usr/bin/make ]] \
 		|| [[ $(make --version 2>&1) == *GNU" Make "4* ]] \
@@ -1539,9 +1541,14 @@ bootstrap_stage1() {
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
 		|| (bootstrap_bison) || return 1
-	[[ -x ${ROOT}/tmp/usr/bin/uniq ]] \
-		|| [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \
-		|| (bootstrap_coreutils) || return 1
+	if [[ -x ${ROOT}/tmp/usr/bin/uniq ]]
+		if [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]]; then
+			CP="cp"
+		else
+			CP="${ROOT}/tmp/bin/cp"
+			(bootstrap_coreutils) || return 1
+		fi
+	fi
 	[[ -x ${ROOT}/tmp/usr/bin/find ]] \
 		|| [[ $(find --version 2>&1) == *GNU* ]] \
 		|| (bootstrap_findutils) || return 1
@@ -1647,7 +1654,7 @@ bootstrap_stage1() {
 		-e ${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf ]] \
 		|| (bootstrap_setup) || return 1
 	mkdir -p "${ROOT}"/tmp/etc/. || return 1
-	[[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || "${ROOT}"/tmp/bin/cp -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc || return 1
+	[[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || "${CP}" -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc || return 1
 
 	# setup portage
 	[[ -e ${ROOT}/tmp/usr/bin/emerge ]] || (bootstrap_portage) || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     8d2be45c944c600d38baf85975a9b4e3bd1a984a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 12:23:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 12:23:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8d2be45c

bootstrap-prefix.sh: fix if

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7421fa3f57..96d52d8390 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1541,7 +1541,7 @@ bootstrap_stage1() {
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
 		|| (bootstrap_bison) || return 1
-	if [[ -x ${ROOT}/tmp/usr/bin/uniq ]]
+	if [[ -x ${ROOT}/tmp/usr/bin/uniq ]]; then
 		if [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]]; then
 			CP="cp"
 		else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     122ddc4f99feb3e9b24c648f5f1c7389f2be05ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 12:53:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 12:53:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=122ddc4f

bootstrap-prefix.sh: cleanup whitespace

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 81aeca51f8..bafcf0c267 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -425,7 +425,7 @@ bootstrap_setup() {
 			;;
 		riscv64-pc-linux-gnu)
 			profile=${profile_linux/ARCH/riscv}
-			;;	
+			;;
 		x86_64-pc-linux-gnu)
 			profile=${profile_linux/ARCH/amd64}
 			profile=${profile/17.0/17.1/no-multilib}
@@ -440,7 +440,7 @@ bootstrap_setup() {
 			profile=${profile_linux/ARCH/ppc64le}
 			;;
 		riscv-pc-unknown-linux-gnu)
-			profile=${profile_linux/ARCH/riscv}	
+			profile=${profile_linux/ARCH/riscv}
 			;;
 		aarch64-unknown-linux-gnu)
 			profile=${profile_linux/ARCH/arm64}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     577ce5b8552f84efe76c3e5e20abb5453df4a909
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 12:58:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 12:58:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=577ce5b8

bootstrap-prefix.sh: style cleanups

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 55 ++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bafcf0c267..d170bf8706 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -40,7 +40,7 @@ emake() {
 	[[ $* == *install* ]] \
 		&& estatus "stage1: installing ${PWD##*/}" \
 		|| estatus "stage1: building ${PWD##*/}"
-	v $MAKE ${MAKEOPTS} "$@" || return 1
+	v ${MAKE} ${MAKEOPTS} "$@" || return 1
 }
 
 efetch() {
@@ -80,7 +80,7 @@ efetch() {
 		estatus "stage1: fetching ${1##*/}"
 		pushd "${DISTDIR}" > /dev/null
 
-		# try for mirrors first, fall back to distfiles, then try given location
+		# Try for mirrors first, fall back to distfiles, then try given location
 		local locs=( )
 		local loc
 		for loc in ${GENTOO_MIRRORS} ${DISTFILES_G_O} ${DISTFILES_PFX}; do
@@ -299,7 +299,7 @@ configure_toolchain() {
 
 bootstrap_setup() {
 	local profile=""
-	einfo "setting up some guessed defaults"
+	einfo "Setting up some guessed defaults"
 
 	# 2.6.32.1 -> 2*256^3 + 6*256^2 + 32 * 256 + 1 = 33955841
 	kver() { uname -r|cut -d\- -f1|awk -F. '{for (i=1; i<=NF; i++){s+=lshift($i,(4-i)*8)};print s}'; }
@@ -538,7 +538,7 @@ bootstrap_setup() {
 	# Use package.use to disable in the portage tree to be shared between
 	# stage2 and stage3. The hack will be undone during tree sync in stage3.
 	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
-	# disable bootstrapping libcxx* with libunwind
+	# Disable bootstrapping libcxx* with libunwind
 	sys-libs/libcxxabi -libunwind
 	sys-libs/libcxx -libunwind
 	# Most binary Linux distributions seem to fancy toolchains that
@@ -951,12 +951,12 @@ bootstrap_gnu() {
 	[[ ${PN} == "bash" && ${CHOST} != *-cygwin* ]] \
 		&& myconf="${myconf} --disable-readline"
 
-	# on e.g. musl systems bash will crash with a malloc error if we use
+	# On e.g. musl systems bash will crash with a malloc error if we use
 	# bash' internal malloc, so disable it during it this stage
 	[[ ${PN} == "bash" ]] && \
 		myconf="${myconf} --without-bash-malloc"
 
-	# ensure we don't read system-wide shell initialisation, it may
+	# Ensure we don't read system-wide shell initialisation, it may
 	# contain cruft, bug #650284
 	[[ ${PN} == "bash" ]] && \
 		export CPPFLAGS="${CPPFLAGS} \
@@ -1131,7 +1131,7 @@ bootstrap_python() {
 
 	local myconf=""
 
-	case $CHOST in
+	case ${CHOST} in
 	(x86_64-*-*|sparcv9-*-*)
 		export CFLAGS="-m64"
 		;;
@@ -1140,7 +1140,7 @@ bootstrap_python() {
 		;;
 	esac
 
-	case $CHOST in
+	case ${CHOST} in
 		*-*-cygwin*)
 			# --disable-shared would link modules against "python.exe"
 			# so renaming to "pythonX.Y.exe" will break them.
@@ -1167,7 +1167,7 @@ bootstrap_python() {
 	export CPPFLAGS="-I${ROOT}/tmp/usr/include"
 	export LDFLAGS="${CFLAGS} -L${ROOT}/tmp/usr/lib"
 	# set correct flags for runtime for ELF platforms
-	case $CHOST in
+	case ${CHOST} in
 		*-linux*)
 			# GNU ld
 			LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}"
@@ -1193,9 +1193,9 @@ bootstrap_python() {
 
 	einfo "Compiling ${A%.tar.*}"
 
-	# some ancient versions of hg fail with "hg id -i", so help
+	# - Some ancient versions of hg fail with "hg id -i", so help
 	# configure to not find them using HAS_HG
-	# do not find libffi via pkg-config using PKG_CONFIG
+	# - Do not find libffi via pkg-config using PKG_CONFIG
 	HAS_HG=no \
 	PKG_CONFIG= \
 	econf \
@@ -1272,7 +1272,7 @@ bootstrap_cmake() {
 }
 
 bootstrap_zlib_core() {
-	# use 1.2.8 by default, current bootstrap guides
+	# Use 1.2.8 by default, current bootstrap guides
 	PV="${1:-1.2.8}"
 	A=zlib-${PV}.tar.gz
 
@@ -1495,8 +1495,8 @@ bootstrap_stage1() {
 	# bits-size of the compiler, which needs not to match what we're
 	# bootstrapping for.  This is no problem since they're just tools,
 	# for which it really doesn't matter how they run, as long AS they
-	# run.  For libraries, this is different, since they are relied on
-	# by packages we emerge lateron.
+	# run.  For libraries, this is different, since they are relied upon
+	# by packages we emerge later on.
 	# Changing this to compile the tools for the bits the bootstrap is
 	# for, is a BAD idea, since we're extremely fragile here, so
 	# whatever the native toolchain is here, is what in general works
@@ -1513,7 +1513,7 @@ bootstrap_stage1() {
 	configure_toolchain
 	export CC CXX
 
-	# run all bootstrap_* commands in a subshell since the targets
+	# Run all bootstrap_* commands in a subshell since the targets
 	# frequently pollute the environment using exports which affect
 	# packages following (e.g. zlib builds 64-bits)
 
@@ -1931,7 +1931,7 @@ bootstrap_stage2() {
 	done
 
 	if [[ ${compiler_type} == clang ]] ; then
-		# we use Clang as our toolchain compiler, so we need to make
+		# We use Clang as our toolchain compiler, so we need to make
 		# sure we actually use it
 		mkdir -p -- "${MAKE_CONF_DIR}"
 		{
@@ -1944,6 +1944,7 @@ bootstrap_stage2() {
 			echo "BUILD_CC=${CHOST}-clang"
 			echo "BUILD_CXX=${CHOST}-clang++"
 		} >> "${MAKE_CONF_DIR}/0100_bootstrap_prefix_clang.conf"
+
 		# llvm won't setup symlinks to CHOST-clang here because
 		# we're in a cross-ish situation (at least according to
 		# multilib.eclass -- can't blame it at this point really)
@@ -1988,7 +1989,7 @@ bootstrap_stage3() {
 		fi
 	fi
 
-	# if we resume this stage and python-exec was installed already in
+	# If we resume this stage and python-exec was installed already in
 	# tmp, we basically made the system unusable, so remove python-exec
 	# here so we can use the python in tmp
 	for pef in python{,3} python{,3}-config ; do
@@ -2170,15 +2171,15 @@ bootstrap_stage3() {
 	# in addition, avoid collisions
 	rm -Rf "${ROOT}"/tmp/usr/lib/python${PYTHONMAJMIN}/site-packages/clang
 
-	# try to get ourself out of the mud, bug #575324
+	# Try to get ourself out of the mud, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto --disable-bootstrap')" \
 	GCC_MAKE_TARGET=$(rapx all) \
 	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 	PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \
 	pre_emerge_pkgs --nodeps ${compiler} || return 1
-	# undo libgcc_s.so path of stage2
 
-	# now we have the compiler right there
+	# Undo libgcc_s.so path of stage2
+	# Now we have the compiler right there
 	unset CXX CPPFLAGS LDFLAGS
 
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
@@ -2192,10 +2193,11 @@ bootstrap_stage3() {
 		rm -f "${ROOT}"/bin/sh
 		ln -s bash "${ROOT}"/bin/sh
 	fi
-	# start using apps from new target
+
+	# Start using apps from new target
 	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
-	# get a sane bash, overwriting tmp symlinks
+	# Get a sane bash, overwriting tmp symlinks
 	pre_emerge_pkgs "" "app-shells/bash" || return 1
 
 	# now we have a shell right there
@@ -2213,7 +2215,8 @@ bootstrap_stage3() {
 		app-admin/eselect
 		$( [[ ${CHOST} == *-cygwin* ]] && echo sys-libs/cygwin-crypt )
 	)
-	# for grep we need to do a little workaround as we might use llvm-3.4
+
+	# For grep we need to do a little workaround as we might use llvm-3.4
 	# here, which doesn't necessarily grok the system headers on newer
 	# OSX, confusing the buildsystem
 	ac_cv_c_decl_report=warning \
@@ -2251,7 +2254,7 @@ bootstrap_stage3() {
 		emerge --color n --sync || emerge-webrsync || return 1
 	fi
 
-	# avoid installing git or encryption just for fun while completing @system
+	# Avoid installing git or encryption just for fun while completing @system
 	export USE="-git -crypt"
 
 	# Portage should figure out itself what it needs to do, if anything.
@@ -2260,7 +2263,7 @@ bootstrap_stage3() {
 	unset CFLAGS CXXFLAGS CPPFLAGS
 	emerge --color n -uDNv system || return 1
 
-	# remove anything that we don't need (compilers most likely)
+	# Remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"
 	estatus "stage3: emerge --depclean"
 	emerge --color n --depclean
@@ -2300,7 +2303,7 @@ set_helper_vars() {
 
 bootstrap_interactive() {
 	# TODO should immediately die on platforms that we know are
-	# impossible due extremely hard dependency chains
+	# impossible due to extremely hard dependency chains
 	# (NetBSD/OpenBSD)
 
 	cat <<"EOF"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     74526e8c2f68396a50d90d462b088ea67bc6c832
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 12:58:53 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 12:58:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=74526e8c

bootstrap-prefix.sh: fix LD_LIBRARY_PATH check typo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d170bf8706..fbf7af3b68 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3357,7 +3357,7 @@ then
 	exit 1
 fi
 
-if [[ -n ${LD_LIBARY_PATH} || -n ${DYLD_LIBRARY_PATH} ]] ; then
+if [[ -n ${LD_LIBRARY_PATH} || -n ${DYLD_LIBRARY_PATH} ]] ; then
 	eerror "EEEEEK!  You have LD_LIBRARY_PATH or DYLD_LIBRARY_PATH set"
 	eerror "in your environment.  This is a guarantee for TROUBLE."
 	eerror "Cowardly refusing to operate any further this way!"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     3a2b85b14b4bbe89e99c53bbd11621d1c7533cc5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 12:52:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 12:52:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3a2b85b1

bootstrap-prefix.sh: use standard copyright header

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 039e6a5c61..81aeca51f8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-# Copyright 2006-2022 Gentoo Authors; Distributed under the GPL v2
+# Copyright 2006-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 trap 'exit 1' TERM KILL INT QUIT ABRT
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     cfa5808aa9015e7c95effa493c22d20b524c9901
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 12:51:32 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 12:51:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cfa5808a

bootstrap-prefix.sh: fix fallback logic for bootstrap_coreutils

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 96d52d8390..039e6a5c61 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1542,13 +1542,20 @@ bootstrap_stage1() {
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
 		|| (bootstrap_bison) || return 1
 	if [[ -x ${ROOT}/tmp/usr/bin/uniq ]]; then
+		# If the system has a uniq, let's use it to test whether
+		# coreutils is new enough (and GNU).
 		if [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]]; then
 			CP="cp"
-		else
-			CP="${ROOT}/tmp/bin/cp"
-			(bootstrap_coreutils) || return 1
 		fi
 	fi
+
+	# But for e.g. OpenBSD, it isn't going to be, so if our test failed,
+	# bootstrap coreutils.
+	if [[ -z ${CP} ]] ; then
+		CP="${ROOT}/tmp/bin/cp"
+		(bootstrap_coreutils) || return 1
+	fi
+
 	[[ -x ${ROOT}/tmp/usr/bin/find ]] \
 		|| [[ $(find --version 2>&1) == *GNU* ]] \
 		|| (bootstrap_findutils) || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     38401400615050684b8902f831abccee0bd551ed
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Jun 30 13:08:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 16:10:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=38401400

bootstrap-prefix.sh: fix coreutils check

It should be inverted. Also bootstrap coreutils only when needed.

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Closes: https://github.com/gentoo/prefix/pull/11
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fbf7af3b68..5670f37bc2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1542,20 +1542,19 @@ bootstrap_stage1() {
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
 		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
 		|| (bootstrap_bison) || return 1
-	if [[ -x ${ROOT}/tmp/usr/bin/uniq ]]; then
+	if [[ ! -x ${ROOT}/tmp/usr/bin/uniq ]]; then
 		# If the system has a uniq, let's use it to test whether
 		# coreutils is new enough (and GNU).
 		if [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]]; then
 			CP="cp"
+		else
+			(bootstrap_coreutils) || return 1
 		fi
 	fi
 
-	# But for e.g. OpenBSD, it isn't going to be, so if our test failed,
-	# bootstrap coreutils.
-	if [[ -z ${CP} ]] ; then
-		CP="${ROOT}/tmp/bin/cp"
-		(bootstrap_coreutils) || return 1
-	fi
+	# But for e.g. BSD, it isn't going to be, so if our test failed,
+	# use bootstrapped coreutils.
+	[[ -z ${CP} ]] && CP="${ROOT}/tmp/bin/cp"
 
 	[[ -x ${ROOT}/tmp/usr/bin/find ]] \
 		|| [[ $(find --version 2>&1) == *GNU* ]] \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     a2d84b5dea75df392e9d4fc093b88c77087fd687
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 18:15:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 18:15:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a2d84b5d

bootstrap-prefix.sh: crank up Python 3.9 version

Closes: https://bugs.gentoo.org/843368
Closes: https://bugs.gentoo.org/835579
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5670f37bc2..a484eae4d2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1035,13 +1035,14 @@ bootstrap_gnu() {
 
 PYTHONMAJMIN=3.9   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-	PV=3.9.6
+	PV=3.9.13
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 
-	# don't really want to put this on the mirror, since they are
-	# non-vanilla sources, bit specific for us
-	efetch ${DISTFILES_URL}/${A} || return 1
+	# Don't really want to put this on the mirror, since they are
+	# non-vanilla sources, bit specific for us. Ideally use HTTPS / upstream
+	# but fall back to dev.gentoo.org w/ HTTP (host wget may not suport HTTPS).
+	efetch https://www.python.org/ftp/python/${PV}/${A} || efetch ${DISTFILES_URL}/${A} || return 1
 
 	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/python-${PV}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     fe3475aa2bf9ef0c965909f0c846aa7b7a75cd04
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 18:18:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 18:18:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fe3475aa

bootstrap-prefix.sh: bump snapshot for autotools.eclass (and distutils-r1) fix

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a484eae4d2..387a66c827 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -618,7 +618,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20220616"
+	local PV="20220629"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     7794c9a763b6b627dc6b28530a2a5c7659209a70
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 18:19:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 18:19:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7794c9a7

bootstrap-prefix.sh: bump LibreSSL

Bug: https://bugs.gentoo.org/817914
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 387a66c827..127d91aca7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1458,6 +1458,8 @@ bootstrap_bzip2() {
 }
 
 bootstrap_libressl() {
+	bootstrap_simple libressl 3.4.3 gz \
+		https://ftp.openbsd.org/pub/OpenBSD/LibreSSL || \
 	bootstrap_simple libressl 3.2.4 gz \
 		https://ftp.openbsd.org/pub/OpenBSD/LibreSSL || \
 	bootstrap_simple libressl 2.8.3 gz \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     38898757029ed90d486d2dae6f0febf355bc9fd9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 19:14:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 19:14:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=38898757

Revert "bootstrap-prefix.sh: bump snapshot for autotools.eclass (and distutils-r1) fix"

I'd checked the snapshot was there but not the other prefix-overlay
tarball it fetches.

This reverts commit fe3475aa2bf9ef0c965909f0c846aa7b7a75cd04.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 127d91aca7..6a7d27bb4b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -618,7 +618,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20220629"
+	local PV="20220616"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a28bd032cb352b0f344c74c0c3d36d9a64782645
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 06:07:35 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 06:07:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a28bd032

scripts/bootstrap-prefix: bump snapshot for autotools.eclass

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6a7d27bb4b..127d91aca7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -618,7 +618,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20220616"
+	local PV="20220629"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     23e04465be51d3e2156981bf9851a4bd3163e96c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 06:30:08 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 06:30:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=23e04465

scripts/bootstrap-prefix: cleanup bootstrap_python somewhat

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 127d91aca7..2a28478970 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1039,10 +1039,7 @@ bootstrap_python() {
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 
-	# Don't really want to put this on the mirror, since they are
-	# non-vanilla sources, bit specific for us. Ideally use HTTPS / upstream
-	# but fall back to dev.gentoo.org w/ HTTP (host wget may not suport HTTPS).
-	efetch https://www.python.org/ftp/python/${PV}/${A} || efetch ${DISTFILES_URL}/${A} || return 1
+	efetch https://www.python.org/ftp/python/${PV}/${A}
 
 	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/python-${PV}"
@@ -1195,7 +1192,7 @@ bootstrap_python() {
 	einfo "Compiling ${A%.tar.*}"
 
 	# - Some ancient versions of hg fail with "hg id -i", so help
-	# configure to not find them using HAS_HG
+	#   configure to not find them using HAS_HG (TODO: obsolete?)
 	# - Do not find libffi via pkg-config using PKG_CONFIG
 	HAS_HG=no \
 	PKG_CONFIG= \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3085a0a30f8439efeb3178a852af00109d29fcad
Author:     Tom Gillespie <tgbugs <AT> gmail <DOT> com>
AuthorDate: Fri Jun 17 08:10:50 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 17:22:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3085a0a3

bootstrap-prefix.sh fixes for stage1 cygwin bash and python failures

bootstrap_gnu --disable-readline seems to work and seems to be needed
on cygwin now for bash 5.1 and cygwin-3.3.5-341

bootstrap_python update patches to use cygwin python39 patch set for
3.9.9 and source from their releases since only older versions are on
github and their gitweb does not support downloading snapshots,
requiring git, which makes it unsuitable for bootstrapping

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 46 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2a28478970..aecca9d3e2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -946,10 +946,8 @@ bootstrap_gnu() {
 	export ac_cv_path_POD2MAN=no
 
 	# Darwin9 in particular doesn't compile when using system readline,
-	# but we don't need any groovy input at all, so just disable it,
-	# except for Cygwin, where the patch above would fail to compile
-	[[ ${PN} == "bash" && ${CHOST} != *-cygwin* ]] \
-		&& myconf="${myconf} --disable-readline"
+	# but we don't need any groovy input handling at all, so just disable it
+	[[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline"
 
 	# On e.g. musl systems bash will crash with a malloc error if we use
 	# bash' internal malloc, so disable it during it this stage
@@ -1059,16 +1057,37 @@ bootstrap_python() {
 
 	case ${CHOST} in
 	(*-*-cygwin*)
-		# apply patches from cygwinports much like the ebuild does
-		local gitrev pf pn
-		gitrev="71f2ac2444946c97d892be3892e47d2a509e0e96" # python36 3.6.8
-		efetch "https://github.com/cygwinports/python36/archive/${gitrev}.tar.gz" \
-			|| return 1
-		gzip -dc "${DISTDIR}"/${gitrev}.tar.gz | tar -xf -
-		[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
+		local gitrev cygpyver pf pn patch_folder ffail
+
+		# try github first, if that fails, it means that cygwin has not
+		# archived that repo yet
+		# ideally the version of python used by bootstrap would be one
+		# that cygwin has packaged if we don't do exact matches on the
+		# version then some patches may not apply cleanly
+
+		ffail=0
+		gitrev="42494e325a050ba03638568d7318f8f0075e25fb"
+		efetch "https://github.com/cygwinports/python39/archive/${gitrev}.tar.gz" \
+			|| ffail=1
+		if [[ -z ${ffail} ]]; then
+			gzip -dc "${DISTDIR}"/"${gitrev}.tar.gz" | tar -xf -
+			[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
+			patch_folder="python39-${gitrev}"
+		else
+			cygpyver="3.9.9-1"
+			efetch "https://mirrors.kernel.org/sourceware/cygwin/x86_64/release/python39/python39-${cygpyver}-src.tar.xz" \
+				|| return 1
+			xz -dc "${DISTDIR}"/"python39-${cygpyver}-src.tar.xz" | tar -xf -
+			[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
+			patch_folder="python39-${cygpyver}.src"
+			ffail=0
+		fi
+		[[ ${ffail} == 0 ]] || return 1
+
 		for pf in $(
 			sed -ne '/PATCH_URI="/,/"/{s/.*="//;s/".*$//;p}' \
-			< python36-${gitrev}/python3.cygport
+				< "${patch_folder}/python39.cygport" \
+				| grep -v rpm-wheels | grep -v revert-bpo
 		); do
 			pf="python36-${gitrev}/${pf}"
 			for pn in {1..2} fail; do
@@ -1076,7 +1095,8 @@ bootstrap_python() {
 					eerror "failed to apply ${pf}"
 					return 1
 				fi
-				patch -N -p${pn} -i "${pf}" --dry-run >/dev/null 2>&1 || continue
+				patch -N -p${pn} -i "${pf}" --dry-run >/dev/null 2>&1 \
+					|| continue
 				echo "applying (-p${pn}) ${pf}"
 				patch -N -p${pn} -i "${pf}" || return 1
 				break

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5c854cc776f8988a1a0b68ef62440e3ecf30fd17
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 17:22:50 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 17:22:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5c854cc7

scripts/bootstrap-prefix: missed one bit from cygwin patch

due to merge-conflicts I missed this in previous commit :(

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index aecca9d3e2..1c85f79afb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1089,7 +1089,7 @@ bootstrap_python() {
 				< "${patch_folder}/python39.cygport" \
 				| grep -v rpm-wheels | grep -v revert-bpo
 		); do
-			pf="python36-${gitrev}/${pf}"
+			pf="${patch_folder}/${pf}"
 			for pn in {1..2} fail; do
 				if [[ ${pn} == fail ]]; then
 					eerror "failed to apply ${pf}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     7fa4329d06020143987e2f30da1c06088a213770
Author:     Atharva <atharvaamritkar <AT> protonmail <DOT> com>
AuthorDate: Thu Jul  7 18:46:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 05:41:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7fa4329d

bootstrap-prefix.sh: using lp64d for riscv profile

Signed-off-by: Atharva <atharvaamritkar <AT> protonmail.com>
Closes: https://github.com/gentoo/prefix/pull/13
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1c85f79afb..8987352b22 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -425,6 +425,7 @@ bootstrap_setup() {
 			;;
 		riscv64-pc-linux-gnu)
 			profile=${profile_linux/ARCH/riscv}
+			profile=${profile/17.0/20.0/rv64gc/lp64d}
 			;;
 		x86_64-pc-linux-gnu)
 			profile=${profile_linux/ARCH/amd64}
@@ -441,6 +442,7 @@ bootstrap_setup() {
 			;;
 		riscv-pc-unknown-linux-gnu)
 			profile=${profile_linux/ARCH/riscv}
+			profile=${profile/17.0/20.0/rv64gc/lp64d}
 			;;
 		aarch64-unknown-linux-gnu)
 			profile=${profile_linux/ARCH/arm64}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a7d82a5c38dde1159ac4366971819e5ad4f8291d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 08:16:04 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 08:16:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a7d82a5c

scripts/bootstrap-prefix: bump snapshot for baselayout migration

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8987352b22..2ccb649216 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -620,7 +620,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20220629"
+	local PV="20220718"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5025a353887de4e70e4ac960f9ec2051b387e1e2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 11:58:41 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 12:01:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5025a353

scripts/bootstrap-prefix: force CXXFLAGS for GCC to find our includes

GCC apparently at some point stops looking at CPPFLAGS, which causes it
not to "see" our includes.  So, use CXXFLAGS isntead while we don't have
helpers to make this work.

Bug: https://bugs.gentoo.org/778014
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2ccb649216..c7bf16eedb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1935,9 +1935,13 @@ bootstrap_stage2() {
 	for pkg in ${compiler_stage1} ; do
 		# <glibc-2.5 does not understand .gnu.hash, use
 		# --hash-style=both to produce also sysv hash.
+		# GCC apparently drops CPPFLAGS at some point, which makes it
+		# not find things like gmp which we just installed, so force it
+		# to find our prefix
 		EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both) --with-local-prefix=${ROOT}" \
 		MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 		GCC_MAKE_TARGET=all \
+		OVERRIDE_CXXFLAGS="${CPPFLAGS} -O2 -pipe" \
 		TPREFIX="${ROOT}" \
 		PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \
 		emerge_pkgs --nodeps ${pkg} || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     662d541fbb2e2165e98e2a79556438ba7a95dd36
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 11:49:51 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 11:49:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=662d541f

scripts/bootstrap-prefix: bump snapshot for arm64-macos

This should get past GCC in stage2, and depending on your machine,
complete the entire bootstrap.

Bug: https://bugs.gentoo.org/778014
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c7bf16eedb..0653ec9a74 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -557,11 +557,6 @@ bootstrap_setup() {
 	sys-devel/native-cctools
 	EOF
 
-	[[ ${CHOST} == arm64-*-darwin* ]] &&
-	cat >> "${ROOT}"/etc/portage/package.accept_keywords <<-EOF
-	=sys-devel/gcc-11_pre20200206 **
-	EOF
-
 	# Strange enough, -cxx causes wrong libtool config on Cygwin,
 	# but we require a C++ compiler there anyway - so just use it.
 	[[ ${CHOST} == *-cygwin* ]] ||
@@ -620,7 +615,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20220718"
+	local PV="20220803"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fd1c9f9b6b838173e6f7df0cb8cc5114e55f6c56
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 06:32:34 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 06:32:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fd1c9f9b

scripts/bootstrap-prefix: bump bootstrap python to 3.10 to match tree

There is a problem which makes it hard to upgrade Python without
transition in place (addressed by
c310e44692ad91777c71394dda97cd1f33f72589?), so just use a bootstrap
Python that's equal to the version installed by the tree to avoid this
problem.

While at it, drop arm64-macos hack, since it's no longer necessary.

Bug: https://bugs.gentoo.org/778014
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0653ec9a74..4466831868 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -746,7 +746,7 @@ bootstrap_portage() {
 
 	local tmpportdir=${ROOT}/tmp/${PORTDIR#${ROOT}}
 	[[ -e "${tmpportdir}" ]] || ln -s "${PORTDIR}" "${tmpportdir}"
-	for d in "${ROOT}"/tmp/usr/lib/python?.?; do
+	for d in "${ROOT}"/tmp/usr/lib/python${PYTHONMAJMIN}; do
 		[[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/portage ${d}/portage
 		[[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/_emerge ${d}/_emerge
 	done
@@ -1028,9 +1028,9 @@ bootstrap_gnu() {
 	einfo "${A%.tar.*} successfully bootstrapped"
 }
 
-PYTHONMAJMIN=3.9   # keep this number in line with PV below for stage1,2
+PYTHONMAJMIN=3.10   # keep this number in line with PV below for stage1,2
 bootstrap_python() {
-	PV=3.9.13
+	PV=3.10.4
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 
@@ -1119,12 +1119,6 @@ bootstrap_python() {
 		efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch"
 		patch -p1 < "${DISTDIR}"/python-3.9.6-darwin9_pthreadid.patch
 		;;
-	(arm64-*-darwin*)
-		# Teach Python a new trick (arm64)
-		sed -i \
-			-e "/Unexpected output of 'arch' on OSX/d" \
-			configure
-		;;
 	(*-openbsd*)
 		# OpenBSD is not a multilib system
 		sed -i \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     04d477f6f9a4a51e71d35d200c10ce47ca84c65b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  8 08:08:40 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 08:08:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=04d477f6

scripts/bootstrap-prefix: bump snapshot for arm64-macos profile fixes

This should allow a bootstrap to succeed on arm64-macos, bypassing the
groff build problem.

Bug: https://bugs.gentoo.org/778014
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4466831868..e05ad93720 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -615,7 +615,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20220803"
+	local PV="20220807"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     436fc672b64e117fecc7e3ebccd82936d0dd5433
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  8 10:48:21 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 10:48:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=436fc672

scripts/bootstrap-prefix: do NOT pull in baselayout-prefix

baselayout-prefix is last-rited, and replaced by plain baselayout

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e05ad93720..0635887745 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -503,11 +503,6 @@ bootstrap_setup() {
 		einfo "Your profile is set to ${fullprofile}."
 	fi
 
-	is-rap && cat >> "${ROOT}"/etc/portage/make.profile/make.defaults <<-'EOF'
-	# For baselayout-prefix in stage2 only.
-	ACCEPT_KEYWORDS="~${ARCH}-linux"
-	EOF
-
 	# bug #788613 avoid gcc-11 during stage 2/3 prior sync/emerge -e
 	is-rap && cat >> "${ROOT}"/etc/portage/make.profile/package.mask <<-EOF
 	# during bootstrap mask, bug #788613
@@ -1886,7 +1881,7 @@ bootstrap_stage2() {
 		app-shells/bash
 		app-arch/xz-utils
 		sys-apps/sed
-		sys-apps/baselayout-prefix
+		sys-apps/baselayout
 		dev-libs/libffi
 		sys-devel/m4
 		sys-devel/flex
@@ -2156,7 +2151,7 @@ bootstrap_stage3() {
 			app-portage/elt-patches
 			app-arch/xz-utils
 			sys-apps/sed
-			sys-apps/baselayout-prefix
+			sys-apps/baselayout
 			sys-devel/m4
 			sys-devel/flex
 			sys-devel/binutils-config

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     d15a8504e74114febbbbee439493a282f4450c5c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  3 01:55:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 01:55:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d15a8504

scripts/bootstrap-prefix.sh: fix for >= glibc-2.35 in stage3

slyfox explains it well in the linked bugs, but
the gist is that we mostly got lucky for a while.

We would mix system crt*.o with just-built libc_nonshared.a/libc.so
which led to issues like:
```
configure:4383: x86_64-pc-linux-gnu-gcc -O2 -pipe -O2 -pipe  -L/home/share/gentoo/usr/lib64 -Wl,--dynamic-linker=/home/share/gentoo/lib64/ld-linux-x86-64.so.2 conftest.c  >&5
/home/share/gentoo/tmp/usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: /lib/../lib64/Scrt1.o: in function `_start':
(.text+0x16): undefined reference to `__libc_csu_fini'
/home/share/gentoo/tmp/usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: (.text+0x1d): undefined reference to `__libc_csu_init'
```

We need to force GCC to use the Prefix version
of glibc we just built.

Bug: https://github.com/NixOS/nixpkgs/issues/158042
Closes: https://bugs.gentoo.org/824482
Thanks-to: Bart Oldeman <bartoldeman <AT> gmail.com>
Thanks-to: Sergei Trofimovich <slyich <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0635887745..4795d87ee5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -503,35 +503,6 @@ bootstrap_setup() {
 		einfo "Your profile is set to ${fullprofile}."
 	fi
 
-	# bug #788613 avoid gcc-11 during stage 2/3 prior sync/emerge -e
-	is-rap && cat >> "${ROOT}"/etc/portage/make.profile/package.mask <<-EOF
-	# during bootstrap mask, bug #788613
-	>=sys-devel/gcc-11
-	EOF
-
-	# bug #824482 avoid glibc-2.34
-	if is-rap; then
-		if ! [ -d "${ROOT}"/etc/portage/package.mask ]; then
-			mkdir "${ROOT}"/etc/portage/package.mask
-		fi
-
-		if ! [ -d "${ROOT}"/etc/portage/package.unmask ]; then
-			mkdir "${ROOT}"/etc/portage/package.unmask
-		fi
-
-		cat >> "${ROOT}"/etc/portage/package.mask/glibc <<-EOF
-		# Temporary mask for newer glibc until bootstrapping issues are fixed.
-		# bug #824482: Avoid glibc-2.34 for now. See package.unmask/glibc too.
-		>=sys-libs/glibc-2.34
-		EOF
-
-		cat >> "${ROOT}"/etc/portage/package.unmask/glibc <<-EOF
-		# Temporary mask for newer glibc until bootstrapping issues are fixed.
-		# bug #824482: Avoid glibc-2.34 for now. See package.mask/glibc too.
-		>=sys-libs/glibc-2.34_p1
-		EOF
-	fi
-
 	# Use package.use to disable in the portage tree to be shared between
 	# stage2 and stage3. The hack will be undone during tree sync in stage3.
 	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
@@ -2131,8 +2102,14 @@ bootstrap_stage3() {
 			${linker}
 		)
 		# use the new dynamic linker in place of rpath from now on.
-		RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
+		RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9] | sed s"!${ROOT}/$(get_libdir)/ld-lsb.*!!")
 		export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
+		if [[ ${compiler_type} == gcc ]] ; then
+			# make sure these flags are used even in places that ignore/strip CPPFLAGS/LDFLAGS
+			export LDFLAGS="-B${ROOT}/usr/$(get_libdir) ${LDFLAGS}"
+			export CC="gcc ${CPPFLAGS} ${LDFLAGS}"
+			export CXX="g++ ${CPPFLAGS} ${LDFLAGS}"
+		fi
 		BOOTSTRAP_RAP=yes \
 		pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
@@ -2189,7 +2166,7 @@ bootstrap_stage3() {
 
 	# Undo libgcc_s.so path of stage2
 	# Now we have the compiler right there
-	unset CXX CPPFLAGS LDFLAGS
+	unset CC CXX CPPFLAGS LDFLAGS
 
 	rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c43a5bf0d00d3cb2a0452c35b5c42bf4fc4cfc9f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 08:02:36 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 08:02:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c43a5bf0

scripts/bootstrap-prefix: Darwin fixes

- die when xcode-select needs to be run
- create proper profiles for Big Sur and later

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4795d87ee5..ff23367616 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -395,30 +395,17 @@ bootstrap_setup() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
-		x86_64-apple-darwin20)
+		*64-apple-darwin2[0123456789])
 			# Big Sur is 11.0
-			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/11.$((rev - 20))/x64"
-			;;
-		x86_64-apple-darwin2[123456789])
-			# Monterey is 12.0
-			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/12.$((rev - 21))/x64"
-			;;
-		arm64-apple-darwin20)
-			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/11.$((rev - 20))/arm64"
-			;;
-		# TODO: Come up with something better for macOS 11+
-		x86_64-apple-darwin2[123456789])
 			# Monterey is 12.0
+			# Ventura is 13.0
 			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/12.$((rev - 21))/x64"
-			;;
-		arm64-apple-darwin2[123456789])
-			# Monterey is 12.0
-			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/12.$((rev - 21))/arm64"
+			case ${CHOST%%-*} in
+				x86_64)  arch=x64    ;;
+				arm64)   arch=arm64  ;;
+				*)       arch=error  ;;
+			esac
+			profile="prefix/darwin/macos/$((rev - 9)).0/${arch}"
 			;;
 		i*86-pc-linux-gnu)
 			profile=${profile_linux/ARCH/x86}
@@ -2631,6 +2618,7 @@ continue.  Please execute:
   xcode-select -s /Library/Developer/CommandLineTools
 and try running me again.
 EOF
+				exit 1
 			fi
 		else
 			# let's see if we have an xcode install
@@ -2642,6 +2630,7 @@ valid install.  Try resetting it using:
   sudo xcode-select -r
 and try running me again.
 EOF
+				exit 1
 			fi
 		fi
 	fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a259b45a78f412742e38fe0457030fa244ec8f99
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 09:31:33 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 09:31:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a259b45a

scripts/bootstrap-prefix: bump snapshot for new macOS profile

Added macOS Ventura (Darwin 22) profile

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ff23367616..4a6125b769 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -568,7 +568,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20220807"
+	local PV="20221104"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     a627ff5554f4efb061d1ce261a248efb5e9d7e59
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 11:46:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 15:19:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a627ff55

scripts/bootstrap-prefix: Set a prefix-guest profile for RAP stage2

This is technically more correct, as stage2 uses the host's libc. It
also means that the Gentoo repo can check for the `prefix-guest` USE
flag instead of the magic `BOOTSTRAP_RAP_STAGE2` variable.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Closes: https://github.com/gentoo/prefix/pull/15
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 52 +++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4a6125b769..48f6b686cc 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -298,24 +298,8 @@ configure_toolchain() {
 }
 
 bootstrap_setup() {
-	local profile=""
 	einfo "Setting up some guessed defaults"
 
-	# 2.6.32.1 -> 2*256^3 + 6*256^2 + 32 * 256 + 1 = 33955841
-	kver() { uname -r|cut -d\- -f1|awk -F. '{for (i=1; i<=NF; i++){s+=lshift($i,(4-i)*8)};print s}'; }
-	# >=glibc-2.20 requires >=linux-2.6.32.
-	profile-kernel() {
-		if [[ $(kver) -ge 50462720 ]] ; then # 3.2
-			echo kernel-3.2+
-		elif [[ $(kver) -ge 33955840 ]] ; then # 2.6.32
-			echo kernel-2.6.32+
-		elif [[ $(kver) -ge 33951744 ]] ; then # 2.6.16
-			echo kernel-2.6.16+
-		elif [[ $(kver) -ge 33947648 ]] ; then # 2.6
-			echo kernel-2.6+
-		fi
-	}
-
 	local FS_INSENSITIVE=0
 	touch "${ROOT}"/FOO.$$
 	[[ -e ${ROOT}/foo.$$ ]] && FS_INSENSITIVE=1
@@ -377,6 +361,30 @@ bootstrap_setup() {
 		fi
 		[[ -f ${ROOT}/etc/resolv.conf ]] || ln -s {,"${ROOT}"}/etc/resolv.conf
 		[[ -f ${ROOT}/etc/hosts ]] || cp {,"${ROOT}"}/etc/hosts
+	fi
+
+	bootstrap_profile
+}
+
+bootstrap_profile() {
+	local profile=""
+
+	# 2.6.32.1 -> 2*256^3 + 6*256^2 + 32 * 256 + 1 = 33955841
+	kver() { uname -r|cut -d\- -f1|awk -F. '{for (i=1; i<=NF; i++){s+=lshift($i,(4-i)*8)};print s}'; }
+	# >=glibc-2.20 requires >=linux-2.6.32.
+	profile-kernel() {
+		if [[ $(kver) -ge 50462720 ]] ; then # 3.2
+			echo kernel-3.2+
+		elif [[ $(kver) -ge 33955840 ]] ; then # 2.6.32
+			echo kernel-2.6.32+
+		elif [[ $(kver) -ge 33951744 ]] ; then # 2.6.16
+			echo kernel-2.6.16+
+		elif [[ $(kver) -ge 33947648 ]] ; then # 2.6
+			echo kernel-2.6+
+		fi
+	}
+
+	if is-rap ; then
 		local profile_linux=default/linux/ARCH/17.0/prefix/$(profile-kernel)
 	else
 		local profile_linux=prefix/linux/ARCH
@@ -1624,8 +1632,13 @@ bootstrap_stage1() {
 	[[ -e ${ROOT}/etc/portage/make.profile && \
 		-e ${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf ]] \
 		|| (bootstrap_setup) || return 1
+
+	# setup a profile for stage2
 	mkdir -p "${ROOT}"/tmp/etc/. || return 1
-	[[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || "${CP}" -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc || return 1
+	[[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || \
+		(	"${CP}" -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc && \
+			rm -f "${ROOT}"/tmp/etc/portage/make.profile && \
+			(ROOT="${ROOT}"/tmp PREFIX_DISABLE_RAP=yes bootstrap_profile) ) || return 1
 
 	# setup portage
 	[[ -e ${ROOT}/tmp/usr/bin/emerge ]] || (bootstrap_portage) || return 1
@@ -1732,7 +1745,6 @@ do_emerge_pkgs() {
 				&& export CFLAGS=${OVERRIDE_CFLAGS}
 			[[ -n ${OVERRIDE_CXXFLAGS} ]] \
 				&& export CXXFLAGS=${OVERRIDE_CXXFLAGS}
-			PORTAGE_CONFIGROOT="${EPREFIX}" \
 			PORTAGE_SYNC_STALE=0 \
 			FEATURES="-news ${FEATURES}" \
 			USE="${myuse[*]}" \
@@ -1755,6 +1767,8 @@ do_emerge_pkgs() {
 }
 
 bootstrap_stage2() {
+	export PORTAGE_CONFIGROOT="${ROOT}"/tmp
+
 	if ! type -P emerge > /dev/null ; then
 		eerror "emerge not found, did you bootstrap stage1?"
 		return 1
@@ -1937,6 +1951,8 @@ bootstrap_stage2_log() {
 }
 
 bootstrap_stage3() {
+	export PORTAGE_CONFIGROOT="${ROOT}"
+
 	if ! type -P emerge > /dev/null ; then
 		eerror "emerge not found, did you bootstrap stage1?"
 		return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     b7ff4649798526382d732ef805d51e1a9cdea01d
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Aug 11 18:13:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 03:04:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b7ff4649

Add support for fetching from local GENTOO_MIRRORS

Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Closes: https://github.com/gentoo/prefix/pull/14
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 48f6b686cc..857017581a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -45,11 +45,20 @@ emake() {
 
 efetch() {
 	if [[ ! -e ${DISTDIR}/${1##*/} ]] ; then
-	  	if [[ ${OFFLINE_MODE} ]]; then
-		  echo "I need ${1##*/} from $1 in $DISTDIR, can you give it to me?"
-		  read
-		  [[ -e ${DISTDIR}/${1##*/} ]] && return 0
-		  # Give fetch a try
+		mkdir -p "${DISTDIR}" >& /dev/null
+
+		# Try fetching from local mirrors first, as this requires no connection
+		for loc in ${GENTOO_MIRRORS} ; do
+			if [[ ${loc} = /* && -e "${loc}/${1##*/}" ]]; then
+				cp "${loc}/${1##*/}" "${DISTDIR}/${1##*/}" && return 0
+			fi
+		done
+
+		if [[ ${OFFLINE_MODE} ]] ; then
+			echo "I need ${1##*/} from $1 in $DISTDIR, can you give it to me?"
+			read
+			[[ -e ${DISTDIR}/${1##*/} ]] && return 0
+			# Give fetch a try
 		fi
 
 		if [[ -z ${FETCH_COMMAND} ]] ; then
@@ -75,7 +84,6 @@ efetch() {
 			fi
 		fi
 
-		mkdir -p "${DISTDIR}" >& /dev/null
 		einfo "Fetching ${1##*/}"
 		estatus "stage1: fetching ${1##*/}"
 		pushd "${DISTDIR}" > /dev/null

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     b2820767f0a995c1330a6168a77cda45577255f0
Author:     Peter Foley <pefoley2 <AT> pefoley <DOT> com>
AuthorDate: Wed Feb 22 04:04:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 07:44:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b2820767

Fix prefix python bootstrap for cygwin

Upstream cygwin doesn't ship python 3.10 yet, and the patches in the 3.9
tarball don't apply cleanly.
As a consequence, cygwin bootstrap has been broken since fd1c9f9b6b838173e6f7df0cb8cc5114e55f6c56.
Fix this by using 3.9 to bootstrap for cygwin only.

Bug: https://bugs.gentoo.org/852665

Signed-off-by: Peter Foley <pefoley2 <AT> pefoley.com>
Closes: https://github.com/gentoo/prefix/pull/18
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 857017581a..1ba5108ce1 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -997,9 +997,18 @@ bootstrap_gnu() {
 	einfo "${A%.tar.*} successfully bootstrapped"
 }
 
+if [[ ${CHOST} == *-cygwin* ]] ; then
+PYTHONMAJMIN=3.9   # keep this number in line with PV below for stage1,2
+else
 PYTHONMAJMIN=3.10   # keep this number in line with PV below for stage1,2
+fi
+
 bootstrap_python() {
-	PV=3.10.4
+	if [[ ${CHOST} == *-cygwin* ]] ; then
+          PV=3.9.9
+        else
+	  PV=3.10.4
+        fi
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     6e13b67bf6821221fbb9c006fd975329bf1f991b
Author:     Peter Foley <pefoley2 <AT> pefoley <DOT> com>
AuthorDate: Fri Feb 24 04:29:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 18:51:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6e13b67b

More fixes for python bootstrap on cygwin

After more testing, it appears that the previous logic to set MAJMIN was
broken because CHOST wasn't defined yet.
In addition, the failed attempt to fetch from github was breaking
patching. Given that 3.8 is the last version actually in cygwinports,
just rip out all that logic.

Signed-off-by: Peter Foley <pefoley2 <AT> pefoley.com>
Closes: https://github.com/gentoo/prefix/pull/20
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 54 ++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ce939bfaf5..c82cb4c1a8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -715,7 +715,7 @@ bootstrap_portage() {
 
 	local tmpportdir=${ROOT}/tmp/${PORTDIR#${ROOT}}
 	[[ -e "${tmpportdir}" ]] || ln -s "${PORTDIR}" "${tmpportdir}"
-	for d in "${ROOT}"/tmp/usr/lib/python${PYTHONMAJMIN}; do
+	for d in "${ROOT}"/tmp/usr/lib/python$(python_ver); do
 		[[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/portage ${d}/portage
 		[[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/_emerge ${d}/_emerge
 	done
@@ -997,11 +997,13 @@ bootstrap_gnu() {
 	einfo "${A%.tar.*} successfully bootstrapped"
 }
 
-if [[ ${CHOST} == *-cygwin* ]] ; then
-PYTHONMAJMIN=3.9   # keep this number in line with PV below for stage1,2
-else
-PYTHONMAJMIN=3.10   # keep this number in line with PV below for stage1,2
-fi
+python_ver() {
+	if [[ ${CHOST} == *-cygwin* ]] ; then
+	  echo 3.9   # keep this number in line with PV below for stage1,2
+	else
+	  echo 3.10   # keep this number in line with PV below for stage1,2
+	fi
+}
 
 bootstrap_python() {
 	if [[ ${CHOST} == *-cygwin* ]] ; then
@@ -1032,32 +1034,18 @@ bootstrap_python() {
 
 	case ${CHOST} in
 	(*-*-cygwin*)
-		local gitrev cygpyver pf pn patch_folder ffail
+		local cygpyver pf pn patch_folder
 
-		# try github first, if that fails, it means that cygwin has not
-		# archived that repo yet
 		# ideally the version of python used by bootstrap would be one
 		# that cygwin has packaged if we don't do exact matches on the
 		# version then some patches may not apply cleanly
 
-		ffail=0
-		gitrev="42494e325a050ba03638568d7318f8f0075e25fb"
-		efetch "https://github.com/cygwinports/python39/archive/${gitrev}.tar.gz" \
-			|| ffail=1
-		if [[ -z ${ffail} ]]; then
-			gzip -dc "${DISTDIR}"/"${gitrev}.tar.gz" | tar -xf -
-			[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
-			patch_folder="python39-${gitrev}"
-		else
-			cygpyver="3.9.9-1"
-			efetch "https://mirrors.kernel.org/sourceware/cygwin/x86_64/release/python39/python39-${cygpyver}-src.tar.xz" \
-				|| return 1
-			xz -dc "${DISTDIR}"/"python39-${cygpyver}-src.tar.xz" | tar -xf -
-			[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
-			patch_folder="python39-${cygpyver}.src"
-			ffail=0
-		fi
-		[[ ${ffail} == 0 ]] || return 1
+		cygpyver="3.9.9-1"
+		efetch "https://mirrors.kernel.org/sourceware/cygwin/x86_64/release/python39/python39-${cygpyver}-src.tar.xz" \
+			|| return 1
+		xz -dc "${DISTDIR}"/"python39-${cygpyver}-src.tar.xz" | tar -xf -
+		[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
+		patch_folder="python39-${cygpyver}.src"
 
 		for pf in $(
 			sed -ne '/PATCH_URI="/,/"/{s/.*="//;s/".*$//;p}' \
@@ -1916,7 +1904,7 @@ bootstrap_stage2() {
 		GCC_MAKE_TARGET=all \
 		OVERRIDE_CXXFLAGS="${CPPFLAGS} -O2 -pipe" \
 		TPREFIX="${ROOT}" \
-		PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \
+		PYTHON_COMPAT_OVERRIDE=python$(python_ver) \
 		emerge_pkgs --nodeps ${pkg} || return 1
 
 		if [[ "${pkg}" == *sys-devel/llvm* || ${pkg} == *sys-devel/clang* ]] ;
@@ -1995,7 +1983,7 @@ bootstrap_stage3() {
 	for pef in python{,3} python{,3}-config ; do
 		rm -f "${ROOT}"/tmp/usr/bin/${pef}
 		[[ ${pef} == *-config ]] && ppf=-config || ppf=
-		( cd "${ROOT}"/tmp/usr/bin && ln -s python${PYTHONMAJMIN}${ppf} ${pef} )
+		( cd "${ROOT}"/tmp/usr/bin && ln -s python$(python_ver)${ppf} ${pef} )
 	done
 
 	get_libdir() {
@@ -2173,15 +2161,15 @@ bootstrap_stage3() {
 	# setup for a scenario where python doesn't live in the target
 	# prefix and no helpers are available
 	( cd "${ROOT}"/usr/bin && test ! -e python && \
-		ln -s "${ROOT}"/tmp/usr/bin/python${PYTHONMAJMIN} )
+		ln -s "${ROOT}"/tmp/usr/bin/python$(python_ver) )
 	# in addition, avoid collisions
-	rm -Rf "${ROOT}"/tmp/usr/lib/python${PYTHONMAJMIN}/site-packages/clang
+	rm -Rf "${ROOT}"/tmp/usr/lib/python$(python_ver)/site-packages/clang
 
 	# Try to get ourself out of the mud, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto --disable-bootstrap')" \
 	GCC_MAKE_TARGET=$(rapx all) \
 	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
-	PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \
+	PYTHON_COMPAT_OVERRIDE=python$(python_ver) \
 	pre_emerge_pkgs --nodeps ${compiler} || return 1
 
 	# Undo libgcc_s.so path of stage2
@@ -2193,7 +2181,7 @@ bootstrap_stage3() {
 	# need special care, it depends on texinfo, #717786
 	pre_emerge_pkgs --nodeps sys-apps/gawk || return 1
 
-	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python${PYTHONMAJMIN} )
+	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python$(python_ver) )
 	# Use $ROOT tools where possible from now on.
 	if [[ $(readlink "${ROOT}"/bin/sh) == "${ROOT}/tmp/"* ]] ; then
 		rm -f "${ROOT}"/bin/sh

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     97f76fa9e3aeeac6f44dbc979dcddb86ce7e1686
Author:     Bart Oldeman <bart.oldeman <AT> calculquebec <DOT> ca>
AuthorDate: Wed Mar  1 17:29:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 02:21:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=97f76fa9

Use gcc --sysroot in rap stage3 post glibc install

Since glibc now has non-prefixed filenames in
`$EPREFIX/usr/lib64/libc.so`, it picks up non-prefixed
`/lib64/libc.so.6` from stage2 gcc, unless we replace its -I, -L, and
-B options by --sysroot. Then it will look at the same places as
the future stage3 gcc.

This avoids issues building binutils, which can't find dlopen in
older `/lib64/libc.so.6`, since dlopen used to be in `libdl`
instead.

The whole logic no longer tests for compiler == gcc, since clang
is only used for non-rap on MacOS.

Closes: https://bugs.gentoo.org/895240
Signed-off-by: Bart Oldeman <bart.oldeman <AT> calculquebec.ca>
Closes: https://github.com/gentoo/prefix/pull/22
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c82cb4c1a8..f35de28ff8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2111,13 +2111,11 @@ bootstrap_stage3() {
 		)
 		# use the new dynamic linker in place of rpath from now on.
 		RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9] | sed s"!${ROOT}/$(get_libdir)/ld-lsb.*!!")
-		export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
-		if [[ ${compiler_type} == gcc ]] ; then
-			# make sure these flags are used even in places that ignore/strip CPPFLAGS/LDFLAGS
-			export LDFLAGS="-B${ROOT}/usr/$(get_libdir) ${LDFLAGS}"
-			export CC="gcc ${CPPFLAGS} ${LDFLAGS}"
-			export CXX="g++ ${CPPFLAGS} ${LDFLAGS}"
-		fi
+		export CPPFLAGS="--sysroot=${ROOT}"
+		export LDFLAGS="-Wl,--dynamic-linker=${RAP_DLINKER}"
+		# make sure these flags are used even in places that ignore/strip CPPFLAGS/LDFLAGS
+		export CC="gcc ${CPPFLAGS} ${LDFLAGS}"
+		export CXX="g++ ${CPPFLAGS} ${LDFLAGS}"
 		BOOTSTRAP_RAP=yes \
 		pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     5185768c98c742d1ac6126a8d36f2ccb6a262a4d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 02:25:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 04:52:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5185768c

scripts/bootstrap-prefix.sh: drop obsolete FEATURES="force-prefix"

This was dropped in >=sys-apps/portage-3.0.45 upstream.

Closes: https://github.com/gentoo/prefix/pull/23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f35de28ff8..f1aa870462 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2002,8 +2002,7 @@ bootstrap_stage3() {
 
 	emerge_pkgs() {
 		# stage3 tools should be used first.
-		# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
-		# needed with host portage.
+		# PORTAGE_TMPDIR, EMERGE_LOG_DIR are needed with host portage.
 		#
 		# After the introduction of EAPI-7, eclasses now
 		# strictly distinguish between build dependencies that
@@ -2013,7 +2012,6 @@ bootstrap_stage3() {
 		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
 		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{12,11,10}/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
-		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
 		STAGE=stage3 \
 		do_emerge_pkgs "$@"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     a2d6d90f481821f7d5a10aadd40b86810f845f1e
Author:     Tom Gillespie <tgbugs <AT> gmail <DOT> com>
AuthorDate: Sat Mar 18 00:42:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 01:03:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a2d6d90f

scripts/bootstrap-prefix.sh: bump cygwin python version

3.9.9 is no longer in the cygwin tree so replace it with 3.9.10

Closes: https://bugs.gentoo.org/902091
Signed-off-by: Tom Gillespie <tgbugs <AT> gmail.com>
Closes: https://github.com/gentoo/prefix/pull/25
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f1aa870462..9f048edb00 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1007,7 +1007,7 @@ python_ver() {
 
 bootstrap_python() {
 	if [[ ${CHOST} == *-cygwin* ]] ; then
-          PV=3.9.9
+          PV=3.9.10
         else
 	  PV=3.10.4
         fi
@@ -1040,7 +1040,7 @@ bootstrap_python() {
 		# that cygwin has packaged if we don't do exact matches on the
 		# version then some patches may not apply cleanly
 
-		cygpyver="3.9.9-1"
+		cygpyver="3.9.10-1"
 		efetch "https://mirrors.kernel.org/sourceware/cygwin/x86_64/release/python39/python39-${cygpyver}-src.tar.xz" \
 			|| return 1
 		xz -dc "${DISTDIR}"/"python39-${cygpyver}-src.tar.xz" | tar -xf -

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     2beb40a532501f3a7f030696920547d738163e0a
Author:     Nick Bello <uwu <AT> nikku <DOT> icu>
AuthorDate: Mon Mar 20 12:37:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 12:38:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2beb40a5

scripts/bootstrap-prefix.sh: avoid curl/nghttp2 circular dep

Closes: https://bugs.gentoo.org/901101
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9f048edb00..c032f7424a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2245,7 +2245,8 @@ bootstrap_stage3() {
 	fi
 
 	# Avoid installing git or encryption just for fun while completing @system
-	export USE="-git -crypt"
+	# e.g. bug #901101
+	export USE="-git -crypt -http2"
 
 	# Portage should figure out itself what it needs to do, if anything.
 	einfo "running emerge -uDNv system"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     1684174109750be2a0d96eba93d45ddea6f3c39e
Author:     Yifeng Li <tomli <AT> tomli <DOT> me>
AuthorDate: Mon Apr 24 05:50:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 20:11:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=16841741

bootstrap-prefix.sh: use --disable-darwin-at-rpath in stage2

During Gentoo prefix bootstrap stage2, GCC is built with
"--disable-bootstrap". For Darwin, it means that rather than letting
GCC to eventually build itself using multiple passes, we're forcing
it to build with the host LLVM/clang toolchain in a single pass.
It's not officially supported, but practically it worked. However,
since >=gcc-12.2.0, in order to support the new embedded rpath
feature on Darwin, two incompatible options, "-nodefaultrpaths" and
"-nodefaultexport" are introduced. This causes linking failures,
since these options are only recognized by GCC and are unknown to
LLVM/clang (hypothetically, using an older GCC possibly causes the
same problem as well).

Thus, embedded rpath should be disabled during prefix bootstrap stage2
via --disable-darwin-at-rpath in EXTRA_ECONF.

Bug: https://bugs.gentoo.org/895334
Signed-off-by: Yifeng Li <tomli <AT> tomli.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c032f7424a..392d2f9a3c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1893,13 +1893,37 @@ bootstrap_stage2() {
 	EXTRA_ECONF=$(rapx --with-sysroot=/) \
 	emerge_pkgs --nodeps ${linker} || return 1
 
+	# During Gentoo prefix bootstrap stage2, GCC is built with
+	# "--disable-bootstrap". For Darwin, it means that rather than letting
+	# GCC to eventually build itself using multiple passes, we're forcing
+	# it to build with the host LLVM/clang toolchain in a single pass.
+	# It's not officially supported, but practically it worked. However,
+	# since >=gcc-12.2.0, in order to support the new embedded rpath
+	# feature on Darwin, two incompatible options, "-nodefaultrpaths" and
+	# "-nodefaultexport" are introduced. This causes linking failures,
+	# since these options are only recognized by GCC and are unknown to
+	# LLVM/clang (hypothetically, using an older GCC possibly causes the
+	# same problem as well).
+	#
+	# Thus, embedded rpath should be disabled during prefix bootstrap stage2
+	# and passed into EXTRA_ECONF.
+	# https://bugs.gentoo.org/895334
+	if [[ ${CHOST} == *-darwin* ]] ;
+	then
+		local disable_darwin_rpath="--disable-darwin-at-rpath"
+	else
+		local disable_darwin_rpath=""
+	fi
+
 	for pkg in ${compiler_stage1} ; do
 		# <glibc-2.5 does not understand .gnu.hash, use
 		# --hash-style=both to produce also sysv hash.
 		# GCC apparently drops CPPFLAGS at some point, which makes it
 		# not find things like gmp which we just installed, so force it
 		# to find our prefix
-		EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both) --with-local-prefix=${ROOT}" \
+		# For >=gcc-12.2.0, rpath needs to be disabled in stage2 on
+		# Darwin, see above.
+		EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both) --with-local-prefix=${ROOT} ${disable_darwin_rpath}" \
 		MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 		GCC_MAKE_TARGET=all \
 		OVERRIDE_CXXFLAGS="${CPPFLAGS} -O2 -pipe" \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c9f40c64294b16646560d39ae010fc18c6f28985
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 15:06:30 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 15:06:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c9f40c64

scripts/bootstrap-prefix: bump bootstrap snapshot for Darwin (arm64) fixes

Closes: https://bugs.gentoo.org/898610
Bug: https://bugs.gentoo.org/886491
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 392d2f9a3c..84b0df01a3 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -584,7 +584,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20221104"
+	local PV="20230424"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7904f41ac9e76200eb9bae57a9dbcdd60aaa828f
Author:     Andrey Aleksandrov <aleksandrov <AT> hey <DOT> com>
AuthorDate: Tue Apr 25 15:23:52 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 15:23:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7904f41a

scripts/bootstrap-prefix: set env stuff when running individual stages

Crucial settings like PATH setup are necessary when the individual
stages 1, 2, 3, etc are run, so borrow them from the interactive model
that tries to figure them all out.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 84b0df01a3..272523f17b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2969,7 +2969,8 @@ EOF
 	done
 	export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$EPREFIX/tmp/usr/local/bin:${PATH}"
 
-	cat << EOF
+	if [[ -z ${PARTIAL_BOOTSTRAP} ]]; then
+		cat << EOF
 
 OK!  I'm going to give it a try, this is what I have collected sofar:
   EPREFIX=${EPREFIX}
@@ -2983,14 +2984,15 @@ Prefix.  In short, I'm going to run stage1, stage2, stage3, followed by
 emerge -e system.  If any of these stages fail, both you and me are in
 deep trouble.  So let's hope that doesn't happen.
 EOF
-	echo
-	[[ ${TODO} == 'noninteractive' ]] && ans="" ||
-	read -p "Type here what you want to wish me [luck] " ans
-	if [[ -n ${ans} && ${ans} != "luck" ]] ; then
-		echo "Huh?  You're not serious, are you?"
-		sleep 3
-	fi
-	echo
+		echo
+		[[ ${TODO} == 'noninteractive' ]] && ans="" ||
+		read -p "Type here what you want to wish me [luck] " ans
+		if [[ -n ${ans} && ${ans} != "luck" ]] ; then
+			echo "Huh?  You're not serious, are you?"
+			sleep 3
+		fi
+		echo
+  fi
 
 	if [[ -d ${HOST_GENTOO_EROOT} ]]; then
 		if ! [[ -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage_host_gentoo ; then
@@ -3014,6 +3016,19 @@ EOF
 	ROOT="${EPREFIX}"
 	set_helper_vars
 
+	if [[ -n ${PARTIAL_BOOTSTRAP} ]]; then
+	cat << EOF
+
+OK! All necessary tools and ENV variables were installed:
+  EPREFIX=${EPREFIX}
+  CHOST=${CHOST}
+  PATH=${PATH}
+  MAKEOPTS=${MAKEOPTS}
+Now I'm going to  run an <action> you asked me to.
+EOF
+		return 0;
+	fi
+
 	if ! [[ -e ${EPREFIX}/.stage1-finished ]] && ! bootstrap_stage1_log ; then
 		# stage 1 fail
 		cat << EOF
@@ -3391,6 +3406,17 @@ if [[ -n ${PKG_CONFIG_PATH} ]] ; then
 fi
 
 einfo "ready to bootstrap ${TODO}"
+
+# part of bootstrap_interactive should be executed before any bootstrap_${TODO}
+# to properly setup environment variables and guarantee that bootstrap_${TODO}
+# executes inside a prefix
+if [[ ${TODO} != "noninteractive" && $(type -t bootstrap_${TODO} == "function") ]]; then
+	PARTIAL_BOOTSTRAP=true
+	TODO='noninteractive' bootstrap_interactive || exit 1
+	bootstrap_${TODO} || exit 1
+	exit 0
+fi
+
 # bootstrap_interactive proceeds with guessed defaults when TODO=noninteractive
 bootstrap_${TODO#non} || exit 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c3ad2b1bac41f2b3089658c549f72c1e823e0a41
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 06:28:06 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon May  1 06:28:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c3ad2b1b

scripts/bootstrap-prefix: bump snapshot

This version allowed me to bootstrap x64-macos on darwin17.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 272523f17b..260c7d229f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -584,7 +584,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20230424"
+	local PV="20230429"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c42a4beac106387f0465099f833acdc42c96c2b1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 18:53:21 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May  3 18:53:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c42a4bea

scripts/bootstrap-prefix: bootstrap newer bison

Bug: https://bugs.gentoo.org/902087
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 260c7d229f..65661f615e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1408,13 +1408,15 @@ bootstrap_bash() {
 }
 
 bootstrap_bison() {
-	bootstrap_gnu bison 2.6.2 || bootstrap_gnu bison 2.6.1 || \
-	bootstrap_gnu bison 2.6 || bootstrap_gnu bison 2.5.1 || \
+	bootstrap_gnu bison 3.8.2 || \
+	bootstrap_gnu bison 2.6.2 || \
+	bootstrap_gnu bison 2.5.1 || \
 	bootstrap_gnu bison 2.4
 }
 
 bootstrap_m4() {
-	bootstrap_gnu m4 1.4.19 || bootstrap_gnu m4 1.4.18 # version is patched, so beware
+	bootstrap_gnu m4 1.4.19 || \
+	bootstrap_gnu m4 1.4.18 # version is patched, so beware
 }
 
 bootstrap_gzip() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     1b73ceadb8401fec2bfaa2e7e95a05e1b14671f0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu May  4 07:53:59 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May  4 07:53:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1b73cead

scripts/bootstrap-prefix: use 3.11 as stage1 python

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 65661f615e..de4f70201f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1001,16 +1001,16 @@ python_ver() {
 	if [[ ${CHOST} == *-cygwin* ]] ; then
 	  echo 3.9   # keep this number in line with PV below for stage1,2
 	else
-	  echo 3.10   # keep this number in line with PV below for stage1,2
+	  echo 3.11   # keep this number in line with PV below for stage1,2
 	fi
 }
 
 bootstrap_python() {
 	if [[ ${CHOST} == *-cygwin* ]] ; then
-          PV=3.9.10
-        else
-	  PV=3.10.4
-        fi
+		PV=$(python_ver).10
+	else
+		PV=$(python_ver).3
+	fi
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 
@@ -3423,7 +3423,8 @@ fi
 bootstrap_${TODO#non} || exit 1
 
 # Local Variables:
-# sh-indentation: 8
-# sh-basic-offset: 8
+# sh-indentation: 4
+# sh-basic-offset: 4
 # indent-tabs-mode: t
 # End:
+# vim: set ts=4 sw=4 noexpandtab:

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c5acc17d94e4f034776ea6cf1ff70ce06f815f91
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu May  4 13:38:33 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May  4 13:38:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c5acc17d

scripts/bootstrap-prefix: drop Solaris NM override, use Python 3.10 again

Python 3.11 doesn't work on Solaris, use 3.10 it doesn't matter for
stage1 for as long as Portage runs anyway.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index de4f70201f..4610358c0d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -291,11 +291,6 @@ configure_toolchain() {
 					compiler_stage1=${compiler_stage1/" dev-libs/mpfr "/" <dev-libs/mpfr-4 "}
 					;;
 			esac
-			local nmout=$(nm -B 2>&1)
-			case "${nmout}" in
-				*/dev/null*)  :                            ;;  # apparently GNU
-				*)            export NM="$(type -P nm) -p" ;;  # Solaris nm
-			esac
 			;;
 		*-linux*)
 			is-rap && einfo "Triggering Linux RAP bootstrap"
@@ -1001,7 +996,7 @@ python_ver() {
 	if [[ ${CHOST} == *-cygwin* ]] ; then
 	  echo 3.9   # keep this number in line with PV below for stage1,2
 	else
-	  echo 3.11   # keep this number in line with PV below for stage1,2
+	  echo 3.10   # keep this number in line with PV below for stage1,2
 	fi
 }
 
@@ -1009,7 +1004,7 @@ bootstrap_python() {
 	if [[ ${CHOST} == *-cygwin* ]] ; then
 		PV=$(python_ver).10
 	else
-		PV=$(python_ver).3
+		PV=$(python_ver).4
 	fi
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ce554a6cfc46536e0114e7257ff6b8c20c70a15e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 07:05:24 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May  5 07:05:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ce554a6c

scripts/bootstrap-prefix: bump snapshot to fix Python upgrade issue

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4610358c0d..7fe3ce7808 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -579,7 +579,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20230429"
+	local PV="20230504"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     64d82803742b7e7751241dc3dc6e81f4f956880c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 06:27:47 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May  9 06:27:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=64d82803

scripts/bootstrap-prefix: switch bootstrap to Python 3.11

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7fe3ce7808..2208935e1b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -993,10 +993,15 @@ bootstrap_gnu() {
 }
 
 python_ver() {
+	# keep this number in line with PV below for stage1,2
+	# also, note that this version must match the Python version in the
+	# snapshot for stage3, else packages will break with some python
+	# mismatch error due to Portage using a different version after it
+	# upgraded itself with a newer Python
 	if [[ ${CHOST} == *-cygwin* ]] ; then
 	  echo 3.9   # keep this number in line with PV below for stage1,2
 	else
-	  echo 3.10   # keep this number in line with PV below for stage1,2
+	  echo 3.11   # keep this number in line with PV below for stage1,2
 	fi
 }
 
@@ -1004,12 +1009,16 @@ bootstrap_python() {
 	if [[ ${CHOST} == *-cygwin* ]] ; then
 		PV=$(python_ver).10
 	else
-		PV=$(python_ver).4
+		PV=$(python_ver).3-gentoo-prefix-patched
 	fi
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 
-	efetch https://www.python.org/ftp/python/${PV}/${A}
+	if [[ ${PV} == *-gentoo-prefix-patched ]] ; then
+		efetch https://dev.gentoo.org/~grobian/distfiles/${A}
+	else
+		efetch https://www.python.org/ftp/python/${PV}/${A}
+	fi
 
 	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/python-${PV}"
@@ -1022,7 +1031,7 @@ bootstrap_python() {
 		*)    einfo "Don't know to unpack ${A}"       ;;
 	esac
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
-	S="${S}"/Python-${PV}
+	S="${S}"/Python-${PV%%-*}
 	cd "${S}"
 	rm -rf Modules/_ctypes/libffi* || return 1
 	rm -rf Modules/zlib || return 1
@@ -1068,6 +1077,10 @@ bootstrap_python() {
 			-e '/^#define Py_HUGE_VAL/s/HUGE_VAL$/(__builtin_huge_val())/' \
 			-e '/defined HAVE_DECL_ISNAN/s/ISNAN/USE_FALLBACK/' \
 			Include/pymath.h
+		# OpenIndiana/Solaris 11 defines inet_aton no longer in
+		# libresolv, so use hstrerror to check if we need -lresolv
+		sed -i -e '/AC_CHECK_LIB/s/inet_aton/hstrerror/' \
+			configure || die
 		;;
 	(*-darwin9)
 		# Darwin 9's kqueue seems to act up (at least at this stage), so
@@ -1076,9 +1089,9 @@ bootstrap_python() {
 		sed -i \
 			-e 's/KQUEUE/KQUEUE_DISABLED/' \
 			configure
-		# fixup thread id detection
-		efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch"
-		patch -p1 < "${DISTDIR}"/python-3.9.6-darwin9_pthreadid.patch
+		# fixup thread id detection (only needed on vanilla Python tar)
+		#efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch"
+		#patch -p1 < "${DISTDIR}"/python-3.9.6-darwin9_pthreadid.patch
 		;;
 	(*-openbsd*)
 		# OpenBSD is not a multilib system

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3fe243b695ad34fdb630b2ed096735d7d85c10fc
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 06:46:06 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 14 06:46:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3fe243b6

scripts/bootstrap-prefix: bump bootstrap tree

Closes: https://bugs.gentoo.org/906299
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2208935e1b..ca29825f36 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -579,7 +579,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20230504"
+	local PV="20230513"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8e64e8ab2b8cf0b3aa742fc28dbdd41483423471
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 11:14:03 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 27 11:14:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8e64e8ab

scripts/bootstrap-prefix: drop Cygwin support/code

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 202 +++-----------------------------------------
 1 file changed, 13 insertions(+), 189 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ca29825f36..f7cb6208fa 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2006-2022 Gentoo Authors
+# Copyright 2006-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 trap 'exit 1' TERM INT QUIT ABRT
@@ -72,9 +72,7 @@ efetch() {
 				FETCH_COMMAND="curl -f -L -O"
 			elif [[ x$(type -t fetch) == "xfile" ]] ; then
 				FETCH_COMMAND="fetch"
-			elif [[ x$(type -t ftp) == "xfile" ]] &&
-				 [[ ${CHOST} != *-cygwin* || \
-				 ! $(type -P ftp) -ef $(cygpath -S)/ftp ]] ; then
+			elif [[ x$(type -t ftp) == "xfile" ]] ; then
 				FETCH_COMMAND="ftp"
 			else
 				eerror "no suitable download manager found!"
@@ -122,9 +120,6 @@ configure_cflags() {
 		*-solaris*)
 			export LDFLAGS="-L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib"
 			;;
-		i586-pc-winnt* | *-pc-cygwin*)
-			export LDFLAGS="-L${ROOT}/tmp/usr/lib"
-			;;
 		*)
 			export LDFLAGS="-L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib"
 			;;
@@ -161,11 +156,6 @@ configure_toolchain() {
 	compiler_stage1="${gcc_deps} sys-devel/gcc-config"
 	compiler_type="gcc"
 	case ${CHOST} in
-	*-cygwin*)
-	  # not supported in gcc-4.7 yet, easy enough to install g++
-	  # Cygwin patches come as .zip from github
-	  compiler_stage1+=" app-arch/unzip sys-devel/gcc"
-	  ;;
 	*-darwin*)
 	  # handled below
 	  ;;
@@ -448,23 +438,18 @@ bootstrap_profile() {
 		armv7l-pc-linux-gnu)
 			profile=${profile_linux/ARCH/arm}
 			;;
-		i386-pc-solaris2.11)
-			profile="prefix/sunos/solaris/5.11/x86"
-			;;
 		x86_64-pc-solaris2.11)
 			profile="prefix/sunos/solaris/5.11/x64"
 			;;
-		sparc-sun-solaris2.11)
-			profile="prefix/sunos/solaris/5.11/sparc"
-			;;
-		sparcv9-sun-solaris2.11)
-			profile="prefix/sunos/solaris/5.11/sparc64"
-			;;
-		i586-pc-winnt*)
-			profile="prefix/windows/winnt/${CHOST#i586-pc-winnt}/x86"
+		i386-pc-solaris2*|sparc-sun-solaris2*|sparcv9-sun-solaris2*)
+			eerror "REMOVED ARCH: this Solaris architecture was removed,"
+			eerror "bootstrapping is impossible"
+			exit 1
 			;;
-		x86_64-pc-cygwin*)
-			profile="prefix/windows/cygwin/x64"
+		i586-pc-winnt*|x86_64-pc-cygwin*)
+			eerror "REMOVED ARCH: this Windows architecture was removed,"
+			eerror "bootstrapping is impossible"
+			exit 1
 			;;
 		*)
 			eerror "UNKNOWN ARCH: You need to set up a make.profile symlink to a"
@@ -523,8 +508,7 @@ bootstrap_profile() {
 
 	# Strange enough, -cxx causes wrong libtool config on Cygwin,
 	# but we require a C++ compiler there anyway - so just use it.
-	[[ ${CHOST} == *-cygwin* ]] ||
-		cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
+	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
 	# gmp has cxx flag enabled by default. When dealing with a host
 	# compiler without cxx support this causes configure failure.
 	# In addition, The stage2 g++ is only for compiling stage3 compiler,
@@ -849,24 +833,6 @@ bootstrap_gnu() {
 		patch -p1 < ${DISTDIR}/${tar_patch_file} || return 1
 	fi
 
-	if [[ ${PN}-${PV} == "bash-4.3" && ${CHOST} == *-cygwin* ]] ; then
-		local p patchopts
-		for p in \
-			"-p0" \
-			"${DISTFILES_G_O}/distfiles/bash43-"{001..048} \
-			"-p2" \
-			"https://dev.gentoo.org/~haubi/distfiles/bash-4.3_p39-cygwin-r2.patch" \
-		; do
-			if [[ ${p} == -* ]] ; then
-				patchopts=${p}
-				continue
-			fi
-			efetch "${p}" || return 1
-			patch --forward --no-backup-if-mismatch ${patchopts} \
-				< "${DISTDIR}/${p##*/}" || return 1
-		done
-	fi
-
 	local myconf=""
 	if [[ ${PN} == "make" && ${PV} == "4.2.1" ]] ; then
 		if [[ ${CHOST} == *-linux-gnu* ]] ; then
@@ -998,19 +964,11 @@ python_ver() {
 	# snapshot for stage3, else packages will break with some python
 	# mismatch error due to Portage using a different version after it
 	# upgraded itself with a newer Python
-	if [[ ${CHOST} == *-cygwin* ]] ; then
-	  echo 3.9   # keep this number in line with PV below for stage1,2
-	else
-	  echo 3.11   # keep this number in line with PV below for stage1,2
-	fi
+	echo 3.11   # keep this number in line with PV below for stage1,2
 }
 
 bootstrap_python() {
-	if [[ ${CHOST} == *-cygwin* ]] ; then
-		PV=$(python_ver).10
-	else
-		PV=$(python_ver).3-gentoo-prefix-patched
-	fi
+	PV=$(python_ver).3-gentoo-prefix-patched
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 
@@ -1037,39 +995,6 @@ bootstrap_python() {
 	rm -rf Modules/zlib || return 1
 
 	case ${CHOST} in
-	(*-*-cygwin*)
-		local cygpyver pf pn patch_folder
-
-		# ideally the version of python used by bootstrap would be one
-		# that cygwin has packaged if we don't do exact matches on the
-		# version then some patches may not apply cleanly
-
-		cygpyver="3.9.10-1"
-		efetch "https://mirrors.kernel.org/sourceware/cygwin/x86_64/release/python39/python39-${cygpyver}-src.tar.xz" \
-			|| return 1
-		xz -dc "${DISTDIR}"/"python39-${cygpyver}-src.tar.xz" | tar -xf -
-		[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
-		patch_folder="python39-${cygpyver}.src"
-
-		for pf in $(
-			sed -ne '/PATCH_URI="/,/"/{s/.*="//;s/".*$//;p}' \
-				< "${patch_folder}/python39.cygport" \
-				| grep -v rpm-wheels | grep -v revert-bpo
-		); do
-			pf="${patch_folder}/${pf}"
-			for pn in {1..2} fail; do
-				if [[ ${pn} == fail ]]; then
-					eerror "failed to apply ${pf}"
-					return 1
-				fi
-				patch -N -p${pn} -i "${pf}" --dry-run >/dev/null 2>&1 \
-					|| continue
-				echo "applying (-p${pn}) ${pf}"
-				patch -N -p${pn} -i "${pf}" || return 1
-				break
-			done
-		done
-		;;
 	(*-solaris*)
 		# Solaris' host compiler (if old -- 3.4.3) doesn't grok HUGE_VAL,
 		# and barfs on isnan() so patch it out
@@ -1124,12 +1049,6 @@ bootstrap_python() {
 	esac
 
 	case ${CHOST} in
-		*-*-cygwin*)
-			# --disable-shared would link modules against "python.exe"
-			# so renaming to "pythonX.Y.exe" will break them.
-			# And ctypes dynamically loads "libpythonX.Y.dll" anyway.
-			myconf="${myconf} --enable-shared"
-		;;
 		*-linux*)
 			# Bug 382263: make sure Python will know about the libdir in use for
 			# the current arch
@@ -1294,24 +1213,6 @@ bootstrap_zlib_core() {
 	# 1.2.5 suffers from a concurrency problem
 	[[ ${PV} == 1.2.5 ]] && makeopts=()
 
-	if [[ ${CHOST} == *-cygwin* ]] ; then
-		# gzopen_w is for real _WIN32 only
-		sed -i -e '/gzopen_w/d' win32/zlib.def
-		makeopts=(
-			-f win32/Makefile.gcc
-			SHARED_MODE=1
-			# avoid toolchain finding ./cygz.dll (esp. in parallel build)
-			SHAREDLIB=win32/cygz.dll
-			IMPLIB=libz.dll.a
-			BINARY_PATH="${ROOT}"/tmp/usr/bin
-			INCLUDE_PATH="${ROOT}"/tmp/usr/include
-			LIBRARY_PATH="${ROOT}"/tmp/usr/lib
-			"${makeopts[@]}"
-		)
-		# stage1 python searches for lib/libz.dll
-		ln -sf libz.dll.a "${ROOT}"/tmp/usr/lib/libz.dll
-	fi
-
 	einfo "Compiling ${A%.tar.*}"
 	CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return 1
 	MAKEOPTS=
@@ -1766,18 +1667,6 @@ do_emerge_pkgs() {
 			emerge --color n -v --oneshot --root-deps ${opts} "${pkg}"
 		)
 		[[ $? -eq 0 ]] || return 1
-
-		case ${pkg},${CHOST} in
-		app-shells/bash,*-cygwin*)
-			# Cygwin would resolve 'bin/bash' to 'bin/bash.exe', but
-			# merging bin/bash.exe does not replace the bin/bash symlink.
-			# When we can execute both bin/bash and bin/bash.exe, but
-			# they are different files, then we need to drop the symlink.
-			[[ -x ${EPREFIX}/bin/bash && -x ${EPREFIX}/bin/bash.exe &&
-			 !    ${EPREFIX}/bin/bash  -ef  ${EPREFIX}/bin/bash.exe ]] &&
-				rm -f "${EPREFIX}"/bin/bash
-			;;
-		esac
 	done
 }
 
@@ -1862,7 +1751,6 @@ bootstrap_stage2() {
 		sys-devel/gnuconfig
 		sys-apps/gentoo-functions
 		app-portage/elt-patches
-		$([[ ${CHOST} == *-cygwin* ]] && echo dev-libs/libiconv ) # bash dependency
 		sys-libs/ncurses
 		sys-libs/readline
 		app-shells/bash
@@ -2237,7 +2125,6 @@ bootstrap_stage3() {
 		sys-devel/make
 		sys-apps/file
 		app-admin/eselect
-		$( [[ ${CHOST} == *-cygwin* ]] && echo sys-libs/cygwin-crypt )
 	)
 
 	# For grep we need to do a little workaround as we might use llvm-3.4
@@ -2367,63 +2254,6 @@ EOF
 			;;
 	esac
 
-	if [[ ${CHOST} == *-cygwin* ]]; then
-		if [[ -r /var/run/cygfork/. ]]; then
-			cat << EOF
-
-Whoah there, I've found the /var/run/cygfork/ directory.  This makes
-me believe you have a working fork() in your Cygwin instance, which
-seems you really know what I can do for you when you help me out!
-EOF
-		else
-			echo
-			[[ ${TODO} == 'noninteractive' ]] && ans="yes" ||
-			read -p "Are you really, really sure what you want me to do for you? [no] " ans
-			case "${ans}" in
-			[Yy][Ee][Ss]) ;;
-			*)
-				cat << EOF
-
-Puh, I'm glad you agree with me here, thanks!
-EOF
-				exit 1
-				;;
-			esac
-
-			cat << EOF
-
-Well...
-EOF
-			[[ ${TODO} == 'noninteractive' ]] || sleep 1
-			cat << EOF
-
-Nope, seems you aren't: This is Windows after all,
-which I'm traditionally incompatible with!
-EOF
-			[[ ${TODO} == 'noninteractive' ]] || sleep 1
-			cat << EOF
-
-But wait, there might be help!
-EOF
-			[[ ${TODO} == 'noninteractive' ]] || sleep 1
-			cat << EOF
-
-Once upon a time there was a guy, probably as freaky as you, my master.
-And whether you believe or not, he has been able to do something useful
-to Windows, in that he completed a piece of code to support myself.
-
-Although you already use that piece of code - yes, it's called Cygwin,
-you seem to not use this freaky guy's completions yet.
-
-To help me out of the incompatibility hole, please read and follow
-https://wiki.gentoo.org/wiki/Prefix/Cygwin first.
-
-But remember that you won't get support from upstream Cygwin now.
-EOF
-		  exit 1
-		fi
-	fi
-
 	if [[ ${UID} == 0 ]] ; then
 		cat << EOF
 
@@ -2552,10 +2382,6 @@ EOF
 			[[ -e /Library/Developer/CommandLineTools/usr/bin/clang ]] \
 				&& PATH="/Library/Developer/CommandLineTools/usr/bin:${PATH}"
 			;;
-		*-cygwin*)
-			# Keep some Windows
-			PATH+=":$(cygpath -S):$(cygpath -W)"
-			;;
 	esac
 
 	# TODO: should we better use cc here? or check both?
@@ -2689,8 +2515,6 @@ EOF
 	echo
 	local ncpu=
 	case "${CHOST}" in
-		*-cygwin*)
-			ncpu=$(cmd /D /Q /C 'echo %NUMBER_OF_PROCESSORS%' | tr -d "\\r") ;;
 		*-darwin*)
 			ncpu=$(/usr/sbin/sysctl -n hw.ncpu) ;;
 		*-freebsd* | *-openbsd*)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8833389084f0eb3b79f4dde59fe9f5b9866c4eba
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 17:25:28 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 31 10:27:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=88333890

scripts/bootstrap-prefix: fix Python bootstrap on Solaris

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f7cb6208fa..45cf2f4e2c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1005,7 +1005,10 @@ bootstrap_python() {
 		# OpenIndiana/Solaris 11 defines inet_aton no longer in
 		# libresolv, so use hstrerror to check if we need -lresolv
 		sed -i -e '/AC_CHECK_LIB/s/inet_aton/hstrerror/' \
-			configure || die
+			configure.ac || die
+		# we don't regenerate configure at this point, so just force the
+		# fix result
+		export LIBS="${LIBS} -lresolv"
 		;;
 	(*-darwin9)
 		# Darwin 9's kqueue seems to act up (at least at this stage), so

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c6db2398458c74d6ac1f4915e9733ab1f4e3aa05
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  2 12:23:11 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun  2 12:23:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c6db2398

scripts/bootstrap-prefix: bump bootstrap snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 45cf2f4e2c..8e53e57705 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -563,7 +563,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20230513"
+	local PV="20230601"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ae09a2683a18f7148048d0b037ec80227e1571ce
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 13:54:32 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 13:54:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ae09a268

scripts/bootstrap-prefix: provide safe compiler wrappers in stage1

On systems like Ubuntu installing gcc doesn't mean installing g++, so
when PATH isn't set to just host (original) before looking up g++, it
ends up on the wrapper being created, causing an endless loop at
runtime.

Thus, check if gcc/g++ can be found in host PATH, if not, error out
suggesting to install or make them available.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c50340fb91..d722e0139f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1490,15 +1490,27 @@ bootstrap_stage1() {
 				# If the version of our binutils an older one, they may not
 				# provide what the system gcc is configured to use.
 				# We need to direct the system gcc to find the system binutils.
+				EXEC="$(PATH="${ORIGINAL_PATH}" type -P gcc)"
+				if [[ -z ${EXEC} ]] ; then
+					eerror "could not find 'gcc' in your PATH!"
+					eerror "please install gcc or provide access via PATH or symlink"
+					return 1
+				fi
 				cat >> "${ROOT}"/tmp/usr/local/bin/gcc <<-EOF
 					#! /bin/sh
 					PATH="${ORIGINAL_PATH}" export PATH
-					exec "$(type -P gcc)" "\$@"
+					exec "${EXEC}" "\$@"
 				EOF
+				EXEC="$(PATH="${ORIGINAL_PATH}" type -P g++)"
+				if [[ -z ${EXEC} ]] ; then
+					eerror "could not find 'g++' in your PATH!"
+					eerror "please install g++ or provide access via PATH or symlink"
+					return 1
+				fi
 				cat >> "${ROOT}"/tmp/usr/local/bin/g++ <<-EOF
 					#! /bin/sh
 					PATH="${ORIGINAL_PATH}" export PATH
-					exec "$(type -P g++)" "\$@"
+					exec "${EXEC}" "\$@"
 				EOF
 				chmod 755 "${ROOT}"/tmp/usr/local/bin/g{cc,++}
 			fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     14fbc8f14c4c484e1809e001e262efca9b6f6ecd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  4 07:07:42 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul  4 07:07:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=14fbc8f1

scripts/bootstrap-prefix: don't disable readline on bash

"Recent" bash (5.1) compiles fine on Darwin 9 with readline enabled.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d722e0139f..9c86901e2e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -872,14 +872,9 @@ bootstrap_gnu() {
 	# care about manpages at this stage
 	export ac_cv_path_POD2MAN=no
 
-	# Darwin9 in particular doesn't compile when using system readline,
-	# but we don't need any groovy input handling at all, so just disable it
-	[[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline"
-
 	# On e.g. musl systems bash will crash with a malloc error if we use
 	# bash' internal malloc, so disable it during it this stage
-	[[ ${PN} == "bash" ]] && \
-		myconf="${myconf} --without-bash-malloc"
+	[[ ${PN} == "bash" ]] && myconf="${myconf} --without-bash-malloc"
 
 	# Ensure we don't read system-wide shell initialisation, it may
 	# contain cruft, bug #650284
@@ -2187,7 +2182,7 @@ bootstrap_stage3() {
 	# Portage should figure out itself what it needs to do, if anything.
 	einfo "running emerge -uDNv system"
 	estatus "stage3: emerge -uDNv system"
-	unset CFLAGS CXXFLAGS CPPFLAGS
+	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 	emerge --color n -uDNv system || return 1
 
 	# Remove anything that we don't need (compilers most likely)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     572c1a5a03ea459d305754ccc25de70dffaaa196
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  4 09:36:37 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul  4 09:36:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=572c1a5a

scripts/bootstrap-prefix: use Python 3.10 on Darwin 9

Python 3.10 requires C11, which is not supported by host compiler
GCC-4.0.1.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9c86901e2e..f196eaa4b2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -959,11 +959,19 @@ python_ver() {
 	# snapshot for stage3, else packages will break with some python
 	# mismatch error due to Portage using a different version after it
 	# upgraded itself with a newer Python
-	echo 3.11   # keep this number in line with PV below for stage1,2
+	if [[ ${CHOST} == *-darwin9 ]] ; then
+		echo 3.10  # last known version to compile
+		export PYTHON_FULL_VERSION=3.10.4
+	else
+		echo 3.11
+		export PYTHON_FULL_VERSION="3.11.3-gentoo-prefix-patched"
+	fi
+	# keep this number in line with PV below for stage1,2
 }
 
 bootstrap_python() {
-	PV=$(python_ver).3-gentoo-prefix-patched
+	python_ver  # to get full version
+	PV=${PYTHON_FULL_VERSION}
 	A=Python-${PV}.tar.xz
 	einfo "Bootstrapping ${A%.tar.*}"
 
@@ -1013,8 +1021,8 @@ bootstrap_python() {
 			-e 's/KQUEUE/KQUEUE_DISABLED/' \
 			configure
 		# fixup thread id detection (only needed on vanilla Python tar)
-		#efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch"
-		#patch -p1 < "${DISTDIR}"/python-3.9.6-darwin9_pthreadid.patch
+		efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch"
+		patch -p1 < "${DISTDIR}"/python-3.9.6-darwin9_pthreadid.patch
 		;;
 	(*-openbsd*)
 		# OpenBSD is not a multilib system

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     02c424a9b45035b690daf58088bc6db30220d9ba
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 05:57:10 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 05:57:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=02c424a9

scripts/bootstrap-prefix: bump bootstrap snapshot for gettext/libintl

Closes: https://bugs.gentoo.org/909041
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f196eaa4b2..0a11e18009 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -563,7 +563,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20230601"
+	local PV="20230707"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a3e17d679d38979792cf6960e0607f4a3fc0b794
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 06:23:29 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 06:23:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a3e17d67

scripts/bootstrap-prefix: bump tree for gettext on macOS

Bug: https://bugs.gentoo.org/906507
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0a11e18009..bd31959b32 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -563,7 +563,7 @@ do_tree() {
 bootstrap_tree() {
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20230707"
+	local PV="20230709"
 	if [[ -n ${LATEST_TREE_YES} ]]; then
 		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
 	else

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     9df4b29e8fe7357fd515ada2dea6e3beae078656
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 10:24:14 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 10:24:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9df4b29e

scripts/bootstrap-prefix: align portage version with tree snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bd31959b32..297409fdb9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -630,8 +630,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="3.0.30.1"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.30.1"
+	STABLE_PV="3.0.49"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.49"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%.tar.*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7e645768dc069ea0a416e7e57b96c996d085d82b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 06:21:11 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 06:21:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7e645768

scripts/bootstrap-prefix: keep LDFLAGS while emerging @system

revert a bit gone in through 14fbc8f14c4c484e1809e001e262efca9b6f6ecd

The final @system emerge of stage3 is pulling in the linker, so as long
as we don't have one installed we need manual LDFLAGS in order for the
host linker to find the libs from the new Prefix.

Problem observed in auto-bootstrap x86_64-apple-darwin17/20230710.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 297409fdb9..a4247c3241 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2190,7 +2190,7 @@ bootstrap_stage3() {
 	# Portage should figure out itself what it needs to do, if anything.
 	einfo "running emerge -uDNv system"
 	estatus "stage3: emerge -uDNv system"
-	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	unset CFLAGS CXXFLAGS CPPFLAGS
 	emerge --color n -uDNv system || return 1
 
 	# Remove anything that we don't need (compilers most likely)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     1cb05eb6b30719c84916f57c789ca9cef1f131f6
Author:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 18:16:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 08:02:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1cb05eb6

scripts/bootstrap-prefix: remove error-prone shell logic

This script, in particular, causes the second emerge branch to be taken
if the first branch is intended and failed, obscuring errors.

Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a4247c3241..d1387391d9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1972,9 +1972,11 @@ bootstrap_stage3() {
 
 	# pre_emerge_pkgs relies on stage 2 portage.
 	pre_emerge_pkgs() {
-		is-rap \
-			&& without_stack_emerge_pkgs "$@" \
-			|| with_stack_emerge_pkgs "$@"
+		if is-rap; then
+			without_stack_emerge_pkgs "$@"
+		else
+			with_stack_emerge_pkgs "$@"
+		fi
 	}
 
 	# Some packages fail to properly depend on sys-apps/texinfo.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     f7ead18224b7acdbf168906d5731f3099a396f80
Author:     Arsen Arsenović <arsen <AT> aarsen <DOT> me>
AuthorDate: Thu Jul 27 18:19:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 08:02:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f7ead182

scripts/bootstrap-prefix: ensure gnuconfig is installed in stage3

Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>
Closes: https://github.com/gentoo/prefix/pull/31
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6f7f3f5fdd..f2a24a137a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2045,6 +2045,7 @@ bootstrap_stage3() {
 		fi
 
 		pkgs=(
+			sys-devel/gnuconfig
 			sys-apps/baselayout
 			sys-apps/gentoo-functions
 			app-portage/elt-patches
@@ -2085,6 +2086,7 @@ bootstrap_stage3() {
 		pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 	else
 		pkgs=(
+			sys-devel/gnuconfig
 			sys-apps/gentoo-functions
 			app-portage/elt-patches
 			app-arch/xz-utils

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     b2689697a73a247dcbfd77d69cf73bb2059df118
Author:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 18:19:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 08:02:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b2689697

scripts/bootstrap-prefix: ensure stage2 is in path

Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d1387391d9..6f7f3f5fdd 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1898,11 +1898,26 @@ bootstrap_stage2_log() {
 bootstrap_stage3() {
 	export PORTAGE_CONFIGROOT="${ROOT}"
 
+	# We need the stage2 in PATH for bootstrapping.  We rely on
+	# emerge running on some benign package before running anything
+	# that would rely on 98stage2 coming before 99host
+	mkdir -p "${ROOT}"/etc/env.d/
+	cat > "${ROOT}"/etc/env.d/98stage2 <<-EOF
+		PATH="$(unset PATH;
+			source "${ROOT}"/tmp/etc/profile.env;
+			echo "$PATH")"
+	EOF
+
 	if ! type -P emerge > /dev/null ; then
 		eerror "emerge not found, did you bootstrap stage1?"
 		return 1
 	fi
 
+	# At this point, we should have a proper GCC, and don't need to
+	# rely on the system wrappers.  Let's get rid of them, so that
+	# they stop mucking up builds.
+	rm -f "${ROOT}"/tmp/usr/local/bin/*
+
 	configure_toolchain || return 1
 
 	if [[ ${compiler_type} == clang ]] ; then
@@ -2204,6 +2219,10 @@ bootstrap_stage3() {
 	# (--depclean may fail, which is ok)
 	sed -i -e 's/resume/cleared/' "${ROOT}"/var/cache/edb/mtimedb
 
+	# Remove the stage2 hack from above.  A future emerge run will
+	# get env-update to happen.
+	rm "${ROOT}"/etc/env.d/98stage2
+
 	estatus "stage3 finished"
 	einfo "stage3 successfully finished"
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     550477e81aeb878d4f28cf2095a3be8e2f21c995
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 06:25:46 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 06:28:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=550477e8

scripts/bootstrap-prefix: ensure RAP pulls tree snapshot from gentoo mirrors

prefix redirection mirror might use local (prefix) copies, which means
portage-latest.tar.bz2 might come from an old (cached) archive.  Ensure
RAP uses gentoo mirrors for the snapshot instead.

While at it, just use prefix mirrors for the snapshots instead of
dev.gentoo.org.  Saves a copy step and makes it easier to bump the
snapshot.

Bug: https://bugs.gentoo.org/913349
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f2a24a137a..8e5d6e8b6e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -561,14 +561,15 @@ do_tree() {
 }
 
 bootstrap_tree() {
+	local PV="20230709"
+
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
-	local PV="20230709"
-	if [[ -n ${LATEST_TREE_YES} ]]; then
-		do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2
-	else
-		do_tree http://dev.gentoo.org/~grobian/distfiles prefix-overlay-${PV}.tar.bz2
-	fi
+
+	[[ -n ${LATEST_TREE_YES} ]] && PV=latest
+
+	do_tree "${SNAPSHOT_URL}" portage-${PV}.tar.bz2
+
 	local ret=$?
 	if [[ -n ${TREE_FROM_SRC} ]]; then
 		estatus "stage1: rsyncing Portage tree"
@@ -2247,7 +2248,7 @@ set_helper_vars() {
 	DISTFILES_G_O="http://distfiles.prefix.bitzolder.nl"
 	DISTFILES_PFX="http://distfiles.prefix.bitzolder.nl/prefix"
 	GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
-	SNAPSHOT_HOST=$(rapx ${DISTFILES_G_O} http://rsync.prefix.bitzolder.nl)
+	SNAPSHOT_HOST=$(rapx http://distfiles.gentoo.org http://rsync.prefix.bitzolder.nl)
 	SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
 	GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e392ba57a6cbcd5401f53c5a8a3fc9bd304f2040
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 15:25:29 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 15:25:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e392ba57

scripts/bootstrap-prefix: only use Prefix mirrors for Prefix tree

Bug: https://bugs.gentoo.org/913415
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8e5d6e8b6e..142ef8213e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -546,11 +546,12 @@ do_tree() {
 		# latest tree cannot be fetched from mirrors, always have to
 		# respect the source to get the latest
 		if [[ -n ${LATEST_TREE_YES} ]] ; then
-			echo "$1"
 			( export GENTOO_MIRRORS= DISTFILES_G_O= DISTFILES_PFX= ;
 			  efetch "$1/$2" ) || return 1
 		else
-			efetch "$1/$2" || return 1
+			# use only Prefix mirror
+			( export GENTOO_MIRRORS= DISTFILES_G_O= ;
+			  efetch "$1/$2" ) || return 1
 		fi
 		einfo "Unpacking, this may take a while"
 		estatus "stage1: unpacking Portage tree"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     580a9d39d536e6740450bed591a326980e24ffdb
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 10:54:02 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 10:54:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=580a9d39

scripts/bootstrap-prefix: do not use stacked-prefix on non-RAP bootstraps

The stacked-prefix approach keeps packages in ROOT/tmp instead of the
final destination Prefix.  This causes problems for tools (most notably
binutils-config) do not get configured for the destination Prefix, which
stage3 relies on.

Closes: https://bugs.gentoo.org/910396
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 68 ++++++++++++++-------------------------------
 1 file changed, 21 insertions(+), 47 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 735e896dd0..4f5b1e5a99 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -155,31 +155,13 @@ configure_toolchain() {
 	compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc"
 	compiler_stage1="${gcc_deps} sys-devel/gcc-config"
 	compiler_type="gcc"
-	case ${CHOST} in
-	*-darwin*)
-	  # handled below
-	  ;;
-	*-freebsd* | *-openbsd*)
-	  # comes with clang, handled below
-	  ;;
-	*)
-	  # The host may not have a functioning c++ toolchain, so use a
-	  # stage1 compiler that can build with C only.
-	  # But gcc-4.7 fails to build with gcc-5.4, so we check for
-	  # >gcc-4.7, as anything newer provides c++ anyway (#619542).
-	  # gcc-4.7 is the last version not to require a c++ compiler to
-	  # build
-	  eval $( (gcc -E - | grep compiler_stage1) <<-EOP
-		#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7))
-		  compiler_stage1+=" sys-devel/gcc"
-		#elif defined(__GNUC__) && __GNUC__ >= 4
-		  compiler_stage1+=" <sys-devel/gcc-4.8"
-		#else
-		  compiler_stage1+=" <sys-devel/gcc-4.7"
-		#endif
-		EOP
-	  )
-	esac
+
+	# The host may not have a functioning C++ toolchain, but all
+	# compilers available to us require C++ to build.  The last known
+	# version not to require C++ is gcc-4.7.
+	# We can bootstrap 4.7 in stage1 perhaps if we find envs that do
+	# not have a functioning C++ toolchain, but for now we assume this
+	# is not a problem.
 
 	CC=gcc
 	CXX=g++
@@ -1765,8 +1747,9 @@ bootstrap_stage2() {
 
 	# Disable RAP directory hacks of binutils and gcc.  If libc.so
 	# linker script provides no hint of ld-linux*.so*, ld should
-	# look into its default library path.  Prefix library pathes
+	# look into its default library path.  Prefix library paths
 	# are taken care of by LDFLAGS in configure_cflags().
+	# see profiles/features/prefix/standalone/profile.bashrc
 	export BOOTSTRAP_RAP_STAGE2=yes
 
 	# Build a basic compiler and portage dependencies in $ROOT/tmp.
@@ -1789,15 +1772,6 @@ bootstrap_stage2() {
 		sys-devel/binutils-config
 	)
 
-	# Old versions of gcc has been masked.  We need gcc-4.7 to bootstrap
-	# on systems without a c++ compiler.
-	echo '<sys-devel/gcc-4.8' >> "${ROOT}"/tmp/etc/portage/package.unmask
-
-	# libffi-3.0_rc0 has broken Solaris ld support, which we still
-	# use at this stage (host compiler)
-	[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \
-		>> "${ROOT}"/tmp/etc/portage/package.mask
-
 	# provide active SDK link on Darwin
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		rm -f "${ROOT}"/tmp/MacOSX.sdk
@@ -1952,6 +1926,10 @@ bootstrap_stage3() {
 		echo ${l}
 	}
 
+	# Remember: binutils-config and gcc were built in ROOT/tmp, so they
+	# are looking for includes and libraries under ROOT/tmp, *NOT* ROOT,
+	# therefore we need to export search paths for ROOT (the final
+	# destination Prefix) here until we've installed the toolchain
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
 	[[ ${compiler_type} == gcc ]] && \
 		export CPPFLAGS="-isystem ${ROOT}/usr/include"
@@ -1977,6 +1955,10 @@ bootstrap_stage3() {
 		do_emerge_pkgs "$@"
 	}
 
+	# retained in case we *do* need this, but using this will cause
+	# packages installed end up in ROOT/tmp, which means we keep using
+	# stage2 area and config which breaks things like binutils-config'
+	# path search, so don't use this
 	with_stack_emerge_pkgs() {
 		# keep FEATURES=stacked-prefix until we bump portage in stage1
 		FEATURES="${FEATURES} stacked-prefix" \
@@ -1985,20 +1967,13 @@ bootstrap_stage3() {
 		emerge_pkgs "$@"
 	}
 
-	without_stack_emerge_pkgs() {
+	# pre_emerge_pkgs relies on stage 2 portage, but installs into the
+	# final destination Prefix
+	pre_emerge_pkgs() {
 		PORTAGE_OVERRIDE_EPREFIX="${ROOT}" \
 		emerge_pkgs "$@"
 	}
 
-	# pre_emerge_pkgs relies on stage 2 portage.
-	pre_emerge_pkgs() {
-		if is-rap; then
-			without_stack_emerge_pkgs "$@"
-		else
-			with_stack_emerge_pkgs "$@"
-		fi
-	}
-
 	# Some packages fail to properly depend on sys-apps/texinfo.
 	# We don't really need that package, so we fake it instead,
 	# explicitly emerging it later on will overwrite the fakes.
@@ -2148,7 +2123,7 @@ bootstrap_stage3() {
 		ln -s bash "${ROOT}"/bin/sh
 	fi
 
-	# Start using apps from new target
+	# Start using apps from the final destination Prefix
 	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
 
 	# Get a sane bash, overwriting tmp symlinks
@@ -2214,7 +2189,6 @@ bootstrap_stage3() {
 	# Portage should figure out itself what it needs to do, if anything.
 	einfo "running emerge -uDNv system"
 	estatus "stage3: emerge -uDNv system"
-	unset CFLAGS CXXFLAGS CPPFLAGS
 	emerge --color n -uDNv system || return 1
 
 	# Remove anything that we don't need (compilers most likely)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4ceed4d04eb2341a938d60e0cd0e3268ed208ee0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 19:43:09 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 19:43:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4ceed4d0

scripts/bootstrap-prefix: fix call to non-existant function

Thanks Ronie Henrich for pointing out

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4f5b1e5a99..d261458db2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2163,7 +2163,7 @@ bootstrap_stage3() {
 		sys-apps/portage
 	)
 
-	without_stack_emerge_pkgs "" "${pkgs[@]}" || return 1
+	pre_emerge_pkgs "" "${pkgs[@]}" || return 1
 
 	# Switch to the proper portage.
 	hash -r

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     34fe8e37ce69ed9e459493a0ee56400e8e6f3212
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 19:51:45 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 19:51:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=34fe8e37

scripts/bootstrap-prefix: bump bootstrap snapshot

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d261458db2..4973a23644 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -547,7 +547,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20230709"
+	local PV="20230910"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ac4c67f00fd053c8556580d3101066c99b6d1051
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 07:15:03 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 07:15:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ac4c67f0

scripts/bootstrap-prefix: fix Linux compiler_stage1 setup

Broken by cleanup in 580a9d39d536e6740450bed591a326980e24ffdb, ensure
Linux and Solaris targets get compiler_stage1 set in
configure_toolchain.

Thanks hsk17 for pointing it out.

Closes: https://bugs.gentoo.org/914114
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4973a23644..39ad15b6bf 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -162,6 +162,10 @@ configure_toolchain() {
 	# We can bootstrap 4.7 in stage1 perhaps if we find envs that do
 	# not have a functioning C++ toolchain, but for now we assume this
 	# is not a problem.
+	# On top of this since gcc-11, C++11 is necessary.  This was
+	# introduced in gcc-4.8, but apparently gcc-5 is still buildable
+	# with Apple's gcc-apple-4.0.1, so that's a good candidate
+	# The Prefix tree only contains gcc-12 as of this writing.
 
 	CC=gcc
 	CXX=g++
@@ -198,15 +202,11 @@ configure_toolchain() {
 					return 1
 					;;
 			esac
-			if [[ ${isgcc} == true ]] ; then
-				# current compiler (gcc-11) requires C++11, which is
-				# available since 4.8, so need to bootstrap with <11
-				compiler_stage1+=" <sys-devel/gcc-11"
-				compiler="${compiler%sys-devel/gcc} <sys-devel/gcc-11"
-			else
-				# assume LLVM/Clang has C++11 support
-				compiler_stage1+=" sys-devel/gcc"
-			fi
+			# current compiler (gcc-12) requires C++11, which is
+			# available since 4.8, but we don't have versions in the
+			# tree any more to bootstrap up to this -- so fail
+			# FIXME: should probably stage1 bootstrap GCC-5 or something
+			compiler_stage1+=" sys-devel/gcc"
 			;;
 		*-darwin*)
 			einfo "Triggering Darwin with LLVM/Clang toolchain"
@@ -248,24 +248,12 @@ configure_toolchain() {
 				sys-devel/llvm
 				sys-devel/clang"
 			;;
-		*-freebsd* | *-openbsd*)
-			CC=clang
-			CXX=clang++
-			# TODO: target clang toolchain someday?
-			;;
-		*-solaris*)
-			local ccvers="$(unset CHOST; gcc --version 2>/dev/null)"
-			case "${ccvers}" in
-				*"gcc (GCC) 3.4.3"*)
-					# host compiler doesn't cope with the asm introduced
-					# in mpfr-4, so force using an older one during
-					# bootstrap for this target
-					compiler_stage1=${compiler_stage1/" dev-libs/mpfr "/" <dev-libs/mpfr-4 "}
-					;;
-			esac
-			;;
 		*-linux*)
 			is-rap && einfo "Triggering Linux RAP bootstrap"
+			compiler_stage1+=" sys-devel/gcc"
+			;;
+		*)
+			compiler_stage1+=" sys-devel/gcc"
 			;;
 	esac
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d2ade9a39e38c2e62117794b46b90a7c14237ce1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 13:35:35 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 13:35:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d2ade9a3

scripts/bootstrap-prefix: fix endless loop with Gentoo bootstrap

When we try to use turbo-boost bootstrap, we end up in an endless loop.
Reason is the code that was added to ensure individual stage calls would
have a properly inited environment.  However that contained not just a
bug, but also would cause stage_host_gentoo to be called over and over
again.

Now just exit from bootstrap_interactive once we set all the vars we
need.  Ensure we don't run any bootstrapping code before that point.

Thanks Leonardo Hernández Hernández for pointing this out.

Closes: https://bugs.gentoo.org/914261
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 68 +++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 39 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 39ad15b6bf..21b012bf1d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2811,8 +2811,7 @@ EOF
 	done
 	export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$EPREFIX/tmp/usr/local/bin:${PATH}"
 
-	if [[ -z ${PARTIAL_BOOTSTRAP} ]]; then
-		cat << EOF
+	cat << EOF
 
 OK!  I'm going to give it a try, this is what I have collected sofar:
   EPREFIX=${EPREFIX}
@@ -2826,15 +2825,23 @@ Prefix.  In short, I'm going to run stage1, stage2, stage3, followed by
 emerge -e system.  If any of these stages fail, both you and me are in
 deep trouble.  So let's hope that doesn't happen.
 EOF
-		echo
-		[[ ${TODO} == 'noninteractive' ]] && ans="" ||
-		read -p "Type here what you want to wish me [luck] " ans
-		if [[ -n ${ans} && ${ans} != "luck" ]] ; then
-			echo "Huh?  You're not serious, are you?"
-			sleep 3
-		fi
-		echo
-  fi
+	echo
+	[[ ${TODO} == 'noninteractive' ]] && ans="" ||
+	read -p "Type here what you want to wish me [luck] " ans
+	if [[ -n ${ans} && ${ans} != "luck" ]] ; then
+		echo "Huh?  You're not serious, are you?"
+		sleep 3
+	fi
+	echo
+
+	# because we unset ROOT from environment above, and we didn't set
+	# ROOT as argument in the script, we set ROOT here to the EPREFIX we
+	# just harvested
+	ROOT="${EPREFIX}"
+	set_helper_vars
+
+	# stop here if all we wanted was the env to be setup correctly
+	[[ -n ${SETUP_ENV_ONLY} ]] && return 0
 
 	if [[ -d ${HOST_GENTOO_EROOT} ]]; then
 		if ! [[ -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage_host_gentoo ; then
@@ -2855,25 +2862,6 @@ EOF
 		fi
 	fi
 	
-	# because we unset ROOT from environment above, and we didn't set
-	# ROOT as argument in the script, we set ROOT here to the EPREFIX we
-	# just harvested
-	ROOT="${EPREFIX}"
-	set_helper_vars
-
-	if [[ -n ${PARTIAL_BOOTSTRAP} ]]; then
-	cat << EOF
-
-OK! All necessary tools and ENV variables were installed:
-  EPREFIX=${EPREFIX}
-  CHOST=${CHOST}
-  PATH=${PATH}
-  MAKEOPTS=${MAKEOPTS}
-Now I'm going to  run an <action> you asked me to.
-EOF
-		return 0;
-	fi
-
 	if ! [[ -e ${EPREFIX}/.stage1-finished ]] && ! bootstrap_stage1_log ; then
 		# stage 1 fail
 		cat << EOF
@@ -3308,17 +3296,19 @@ fi
 
 einfo "ready to bootstrap ${TODO}"
 
-# part of bootstrap_interactive should be executed before any bootstrap_${TODO}
-# to properly setup environment variables and guarantee that bootstrap_${TODO}
-# executes inside a prefix
-if [[ ${TODO} != "noninteractive" && $(type -t bootstrap_${TODO} == "function") ]]; then
-	PARTIAL_BOOTSTRAP=true
-	TODO='noninteractive' bootstrap_interactive || exit 1
-	bootstrap_${TODO} || exit 1
-	exit 0
+# When we call individual stages separately (e.g. not from
+# bootstrap_interactive) we might need some env to be setup in order to
+# function properly.  Basically do a non-interactive call for each stage
+# that will only set whatever needs to be set.
+if [[ ${TODO} != "interactive" && ${TODO} != "noninteractive" ]] ; then
+	# squelch the output, we've seen it already when running from
+	# interactive proper
+	SETUP_ENV_ONLY=true TODO=noninteractive \
+		bootstrap_interactive > /dev/null || exit 1
 fi
 
-# bootstrap_interactive proceeds with guessed defaults when TODO=noninteractive
+# call the appropriate function,
+# beware noninteractive is just a mode of interactive
 bootstrap_${TODO#non} || exit 1
 
 # Local Variables:

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3fedadeb966a056885518a29e3894a313c558dcb
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 13:47:06 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 13:47:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3fedadeb

scripts/bootstrap-prefix: prefer ID over NAME when guessing platform

ID is typically something like "debian", NAME "Debian GNU/Linux".  We
want the former.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 21b012bf1d..e6a88b8325 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3138,8 +3138,8 @@ if [[ ${CHOST} == *-linux-* ]] ; then
 	rel=$(lsb_release -sr)
 	if [[ -z ${dist} ]] || [[ -z ${rel} ]] ; then
 		source /etc/os-release  # this may fail if the file isn't there
-		[[ -z ${dist} ]] && dist=${NAME}
 		[[ -z ${dist} ]] && dist=${ID}
+		[[ -z ${dist} ]] && dist=${NAME}
 		[[ -z ${rel} ]] && rel=${VERSION_ID}
 
 	fi

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b0b5e39f1247c3cae5c8d4618a20d396cf70937d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 11:03:54 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 11:03:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b0b5e39f

scripts/bootstrap-prefix: fix RAP stage3 on python due to init.d script

Portage enforces init.d scripts must have a valid shebang, which means
openrc-run must exist on the system.  For RAP-systems this script is to
be provided by openrc (in contrast to baselayout for non-RAP Prefix
systems), however during bootstrap openrc is not pulled in, and in
reality it never is.  So provide a dummy openrc-run in the RAP path for
stage3 before python or rsync are pulled in, such that Portage's QA
check is happy about their init.d scripts.

Closes: https://bugs.gentoo.org/913856
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e6a88b8325..b08a497f41 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2028,6 +2028,18 @@ bootstrap_stage3() {
 		grep -q 'esac' "${ROOT}"/usr/bin/rsync && \
 			rm "${ROOT}"/usr/bin/rsync
 
+		# sys-apps/baselayout will install a dummy openrc-run wrapper
+		# for any package that installs an init.d script, like rsync and
+		# python will need openrc-run to exist, else we'll die with a QA
+		# error, bug #858596.  However it only does this for
+		# prefix-guest, so NOT For RAP, which results in bug #913856.
+		if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
+			[[ -e "${ROOT}"/sbin ]] || mkdir -p "${ROOT}"/sbin
+			echo "We need openrc-run at ${ROOT}/sbin to merge some packages." \
+				> "${ROOT}"/sbin/openrc-run
+			chmod +x "${ROOT}"/sbin/openrc-run
+		fi
+
 		pkgs=(
 			sys-devel/binutils-config
 			sys-libs/zlib
@@ -2139,12 +2151,6 @@ bootstrap_stage3() {
 	TIME_T_32_BIT_OK=yes \
 	pre_emerge_pkgs "" "${pkgs[@]}" || return 1
 
-	if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
-		echo "We need openrc-run at ${ROOT}/sbin to merge rsync." \
-			> "${ROOT}"/sbin/openrc-run
-		chmod +x "${ROOT}"/sbin/openrc-run
-	fi
-
 	pkgs=(
 		virtual/os-headers
 		sys-devel/gettext
@@ -3141,7 +3147,6 @@ if [[ ${CHOST} == *-linux-* ]] ; then
 		[[ -z ${dist} ]] && dist=${ID}
 		[[ -z ${dist} ]] && dist=${NAME}
 		[[ -z ${rel} ]] && rel=${VERSION_ID}
-
 	fi
 	[[ -z ${dist} ]] && dist=linux
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     971f326949216a7edf673bf1b26c644ef20b072d
Author:     Janusz Krzysztofik <jmkrzyszt <AT> gmail <DOT> com>
AuthorDate: Sat Nov  4 07:34:11 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 07:34:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=971f3269

scripts/bootstrap-prefix: match user/group more precise

Avoid over-matching on entries from /etc/{passwd,group}.

Bug: https://bugs.gentoo.org/766417
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b08a497f41..041acf1b1f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -305,7 +305,7 @@ bootstrap_setup() {
 
 	if is-rap ; then
 		if [[ ! -f ${ROOT}/etc/passwd ]]; then
-			if grep -q $(id -un) /etc/passwd; then
+			if grep -q "^$(id -un):" /etc/passwd; then
 				ln -sf {,"${ROOT}"}/etc/passwd
 			else
 				getent passwd > "${ROOT}"/etc/passwd
@@ -314,7 +314,7 @@ bootstrap_setup() {
 			fi
 		fi
 		if [[ ! -f ${ROOT}/etc/group ]]; then
-			if grep -q $(id -gn) /etc/group; then
+			if grep -q "^$(id -gn):" /etc/group; then
 				ln -sf {,"${ROOT}"}/etc/group
 			else
 				getent group > "${ROOT}"/etc/group

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b313adcb844cc7037cc3d19b02ecfcb9c9deb88c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 11:10:00 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 11:10:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b313adcb

scripts/bootstrap-prefix: fix profile for armv7 targets

Thanks fosslinux

Closes: https://bugs.gentoo.org/920437
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 041acf1b1f..a04cadf483 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -405,8 +405,8 @@ bootstrap_profile() {
 		aarch64-unknown-linux-gnu)
 			profile=${profile_linux/ARCH/arm64}
 			;;
-		armv7l-pc-linux-gnu)
-			profile=${profile_linux/ARCH/arm}
+		armv7*-pc-linux-gnu)
+			profile=${profile_linux/ARCH/arm7a}
 			;;
 		x86_64-pc-solaris2.11)
 			profile="prefix/sunos/solaris/5.11/x64"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     bc37c95d8e195bc3420ddb4f8198b1d109927671
Author:     fosslinux <fosslinux <AT> aussies <DOT> space>
AuthorDate: Wed Dec 27 11:26:59 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 09:39:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bc37c95d

Remove i386 MacOS

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a04cadf483..46c89d14c6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -359,8 +359,9 @@ bootstrap_profile() {
 			profile="prefix/darwin/macos/10.$((rev - 4))/ppc"
 			;;
 		i*86-apple-darwin1[578])
-			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
+			eerror "REMOVED ARCH: this 32-bit MacOS architecture was removed,"
+			eerror "bootstrapping is impossible"
+			exit 1
 			;;
 		x86_64-apple-darwin1[5789])
 			rev=${CHOST##*darwin}

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a709bd77db53b483e1b2eb4d77816acfd4f9770a
Author:     fosslinux <fosslinux <AT> aussies <DOT> space>
AuthorDate: Wed Dec 27 11:27:09 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 09:45:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a709bd77

scripts/bootstrap-prefix: fix arm RAP profile (again)

arm uses a sub-dir for the target, the main is still called arm

Closes: https://bugs.gentoo.org/920437
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 46c89d14c6..91e120360e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -407,7 +407,8 @@ bootstrap_profile() {
 			profile=${profile_linux/ARCH/arm64}
 			;;
 		armv7*-pc-linux-gnu)
-			profile=${profile_linux/ARCH/arm7a}
+			profile=${profile_linux/ARCH/arm}
+			profile=${profile/17.0/17.0/armv7a}
 			;;
 		x86_64-pc-solaris2.11)
 			profile="prefix/sunos/solaris/5.11/x64"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     0025f057f69b34d16fb436c1afedfd869b87f649
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 04:10:53 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 04:11:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0025f057

scripts/bootstrap-prefix.sh: disable http2 when emerging @system

Avoid this circular dependency:
```
$ USE=-acl -berkdb -fortran -gdbm -git -libcxx -nls -pcre -python -qmanifest -qtegrity -readline -sanitize bootstrap clang internal-glib PKG=app-shells/bash
[...]
 * Error: circular dependencies:

(net-libs/nghttp2-1.57.0:0/1.14::gentoo, ebuild scheduled for merge) depends on
 (dev-util/cmake-3.27.7:0/0::gentoo, ebuild scheduled for merge) (buildtime)
  (net-misc/curl-8.4.0:0/0::gentoo, ebuild scheduled for merge) (buildtime)
   (net-libs/nghttp2-1.57.0:0/1.14::gentoo, ebuild scheduled for merge) (buildtime_slot_op)

It might be possible to break this cycle
by applying the following change:
- net-misc/curl-8.4.0 (Change USE: -http2)
```

Bug: https://bugs.gentoo.org/901101
Closes: https://bugs.gentoo.org/920887
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 91e120360e..7f3a1b3477 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1606,6 +1606,7 @@ do_emerge_pkgs() {
 			-gdbm
 			-git
 			-libcxx
+			-http2
 			-nls
 			-pcre
 			-python

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     8b37896eb6da6ab9e87104926752a8f8af2476b5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 08:05:06 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 08:05:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8b37896e

scripts/bootstrap-prefix.sh: try bootstrap bash 5.2 as well

Bug: https://bugs.gentoo.org/921535
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 7f3a1b3477..728a148c71 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1294,6 +1294,7 @@ bootstrap_texinfo() {
 }
 
 bootstrap_bash() {
+	bootstrap_gnu bash 5.2 ||
 	bootstrap_gnu bash 5.1 ||
 	bootstrap_gnu bash 4.3 ||
 	bootstrap_gnu bash 4.2

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     dc7f7d0ea3dd0128b69cb034fa68372f6376327a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 08:08:15 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 08:08:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dc7f7d0e

scripts/bootstrap-prefix.sh: add bash-5.0 as well

Why not?

Bug: https://bugs.gentoo.org/921535
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 728a148c71..8ab84a3a2b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1296,6 +1296,7 @@ bootstrap_texinfo() {
 bootstrap_bash() {
 	bootstrap_gnu bash 5.2 ||
 	bootstrap_gnu bash 5.1 ||
+	bootstrap_gnu bash 5.0 ||
 	bootstrap_gnu bash 4.3 ||
 	bootstrap_gnu bash 4.2
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     ebbc3ad0433d3a2595df0c7d10cc1b988ce30346
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 08:29:14 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 08:29:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ebbc3ad0

scripts/bootstrap-prefix.sh: try to bootstrap only >=bash-5.0

EAPI 8 needs bash 5.0 as a minimum.

Bug: https://bugs.gentoo.org/921535
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8ab84a3a2b..ab1c8392d0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1297,8 +1297,6 @@ bootstrap_bash() {
 	bootstrap_gnu bash 5.2 ||
 	bootstrap_gnu bash 5.1 ||
 	bootstrap_gnu bash 5.0 ||
-	bootstrap_gnu bash 4.3 ||
-	bootstrap_gnu bash 4.2
 }
 
 bootstrap_bison() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     e1a7bd326d826028ed21a5db177d869cd21d1040
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 08:29:45 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 08:29:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e1a7bd32

scripts/bootstrap-prefix.sh: fix typo

Bug: https://bugs.gentoo.org/921535
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ab1c8392d0..a719fb6010 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1296,7 +1296,7 @@ bootstrap_texinfo() {
 bootstrap_bash() {
 	bootstrap_gnu bash 5.2 ||
 	bootstrap_gnu bash 5.1 ||
-	bootstrap_gnu bash 5.0 ||
+	bootstrap_gnu bash 5.0
 }
 
 bootstrap_bison() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[James Le Cuirot]

commit:     b0f2edb51723bdc1eb06f5e2e6f2cd8f02f9c057
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 22:56:33 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 22:56:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b0f2edb5

scripts/bootstrap-prefix.sh: Make Linux CHOST detection less braindead

Especially for ARM.

Closes: https://bugs.gentoo.org/921927
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a719fb6010..6b098d6373 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -406,7 +406,7 @@ bootstrap_profile() {
 		aarch64-unknown-linux-gnu)
 			profile=${profile_linux/ARCH/arm64}
 			;;
-		armv7*-pc-linux-gnu)
+		armv7*-unknown-linux-gnueabi*)
 			profile=${profile_linux/ARCH/arm}
 			profile=${profile/17.0/17.0/armv7a}
 			;;
@@ -3068,20 +3068,28 @@ if [[ -z ${CHOST} ]]; then
 	if [[ x$(type -t uname) == "xfile" ]]; then
 		case `uname -s` in
 			Linux)
-				plt="gnu"
-                                for f in /lib/ld-musl-*.so.1; do
-				  [[ -e "$f" ]] && plt="musl"
-                                done
-				sfx="unknown-linux-${plt}"
-				case `uname -m` in
-					ppc*)
-						CHOST="`uname -m | sed -e 's/^ppc/powerpc/'`-${sfx}"
-						;;
-					powerpc*|aarch64*)
-						CHOST="`uname -m`-${sfx}"
-						;;
+				CHOST=$(uname -m)
+				CHOST=${CHOST/#ppc/powerpc}
+				case "${CHOST}" in
+					x86_64|i*86)
+						CHOST+=-pc ;;
 					*)
-						CHOST="`uname -m`-${sfx/unknown/pc}"
+						CHOST+=-unknown ;;
+				esac
+				plt=gnu
+				for f in /lib/ld-musl-*.so.1; do
+					[[ -e $f ]] && plt=musl
+				done
+				CHOST+=-linux-${plt}
+				case "${CHOST}" in
+					arm*)
+						CHOST+=eabi
+						for f in /lib/ld-*hf.so.*; do
+							if [[ -e $f ]]; then
+								CHOST+=hf
+								break
+							fi
+						done
 						;;
 				esac
 				;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     c7209d91d618a1717aca1d607bfafa5c7d6884cb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 19:41:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 19:41:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c7209d91

scripts/bootstrap-prefix.sh: adapt to pkgmoves

Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6b098d6373..d760f747cd 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1771,7 +1771,7 @@ bootstrap_stage2() {
 
 	# cmake has some external dependencies which require autoconf, etc.
 	# unless we only build the buildtool, bug #603012
-	echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
+	echo "dev-build/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
 
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
@@ -2142,7 +2142,7 @@ bootstrap_stage3() {
 		app-arch/gzip
 		app-arch/tar
 		sys-apps/grep
-		sys-devel/make
+		dev-build/make
 		sys-apps/file
 		app-admin/eselect
 	)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f9c3b2bb44c074d4747ca3b3f25af2dc5748c3bd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 07:08:18 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 07:08:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f9c3b2bb

scripts/bootstrap-prefix: bump snapshot for macOS Sanoma and pkgmove

Snapshot and script now match the pkgmoves to dev-build
Support for macOS Sanoma via GCC-13.

Closes: https://bugs.gentoo.org/916291
Closes: https://bugs.gentoo.org/914828
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d760f747cd..f74f179e0d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20230910"
+	local PV="20240114"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b4460610cd88b08c8c8f844dbd92ab6315a2e7a2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 07:18:15 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 07:18:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b4460610

scripts/bootstrap-prefix: bump snapshot for macOS with xtools linker

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f74f179e0d..a33ef6dae0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240114"
+	local PV="20240116"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     928d7d3bfb5e24f7ded38989820355508fb13a17
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 11:52:38 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 11:52:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=928d7d3b

scripts/bootstrap-prefix: use same Portage version as in bootstrap tree

Use autotools-fixed version of Portage that is in the current bootstrap
snapshot.  Perhaps this fixes the stage1 portage install problem
reported on WSL.

Bug: https://bugs.gentoo.org/910469
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a33ef6dae0..de9a22c073 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -607,8 +607,8 @@ bootstrap_portage() {
 	# STABLE_PV that is known to work. Intended for power users only.
 	## It is critical that STABLE_PV is the lastest (non-masked) version that is
 	## included in the snapshot for bootstrap_tree.
-	STABLE_PV="3.0.49"
-	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.49"
+	STABLE_PV="3.0.56.1"
+	[[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.56.1"
 	PV="${TESTING_PV:-${STABLE_PV}}"
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%.tar.*}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     9b1d698d2ed6f8c831e42eb4d408f93575d5cb3d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 08:19:54 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 08:19:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9b1d698d

scripts/bootstrap-prefix: bump snapshot for macOS linker fix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index de9a22c073..b32055a7a5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240116"
+	local PV="20240120"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     eaff3b877e7c05bd1dd932bee68c16591972a862
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 08:43:45 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 08:43:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=eaff3b87

scripts/bootstrap-prefix: bump snapshot and bootstrapping python

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b32055a7a5..adc79592f8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -537,7 +537,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240120"
+	local PV="20240121"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
@@ -936,13 +936,8 @@ python_ver() {
 	# snapshot for stage3, else packages will break with some python
 	# mismatch error due to Portage using a different version after it
 	# upgraded itself with a newer Python
-	if [[ ${CHOST} == *-darwin9 ]] ; then
-		echo 3.10  # last known version to compile
-		export PYTHON_FULL_VERSION=3.10.4
-	else
-		echo 3.11
-		export PYTHON_FULL_VERSION="3.11.3-gentoo-prefix-patched"
-	fi
+	echo 3.11
+	export PYTHON_FULL_VERSION="3.11.7-gentoo-prefix-patched"
 	# keep this number in line with PV below for stage1,2
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     47fe505f79d12c58ce95c75c229c61ad93f494fd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 08:32:17 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 08:32:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=47fe505f

scripts/bootstrap-prefix: update python Darwin9 fix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index adc79592f8..fbd3d9b6de 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -990,7 +990,7 @@ bootstrap_python() {
 		# make Python's selectors resort to poll() or select() for the
 		# time being
 		sed -i \
-			-e 's/KQUEUE/KQUEUE_DISABLED/' \
+			-e 's/kqueue/kqueue_DISABLED/' \
 			configure
 		# fixup thread id detection (only needed on vanilla Python tar)
 		efetch "https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-3.9.6-darwin9_pthreadid.patch"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     343d4f7b818876688b773f092f7db84ac47e67ad
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 12:34:51 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 12:34:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=343d4f7b

scripts/bootstrap-prefix.sh: update dev-util/ninja -> dev-build/ninja

Closes: https://bugs.gentoo.org/922961
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fbd3d9b6de..8f83bb837f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -215,7 +215,7 @@ configure_toolchain() {
 			compiler_stage1="sys-apps/darwin-miscutils"
 			compiler_type="clang"
 			local ccvers="$(unset CHOST; /usr/bin/gcc --version 2>/dev/null)"
-			local llvm_deps="dev-util/ninja"
+			local llvm_deps="dev-build/ninja"
 			case "${ccvers}" in
 				*"Apple clang version "*|*"Apple LLVM version "*)
 					# this is Clang, recent enough to compile recent clang

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3751da68ae4b9e67a6fdea3ed5d028a4400e11d2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 14:02:32 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 14:02:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3751da68

scripts/bootstrap-prefix: fix linking on macOS platforms with a real /

Systems that just have /usr/lib populated by dylibs and /usr/include can
just use that instead of an SDK, which is safer under certain
conditions.  A knowledgable user can modify the symlink easily to use
an SDK or something else in this case.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8f83bb837f..e743594647 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -433,12 +433,21 @@ bootstrap_profile() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# setup MacOSX.sdk symlink for GCC, this should probably be
 		# managed using an eselect module in the future
+		# FWIW, just use system (/) if it seems OK, for some reason
+		# early versions of TAPI-based SDKs did not include some symbols
+		# like fclose, which ld64 is able to resolve from the dylibs
+		# although they are unvisible using e.g. nm.
 		rm -f "${ROOT}"/MacOSX.sdk
-		local SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
-		if [[ ! -e ${SDKPATH} ]] ; then
-			SDKPATH=$(xcodebuild -showsdks | sort -nr \
-				| grep -o "macosx.*" | head -n1)
-			SDKPATH=$(xcode-select -print-path)/SDKs/MacOSX${SDKPATH#macosx}.sdk
+		local SDKPATH
+		if [[ -e /usr/lib/libSystem.B.dylib && -d /usr/include ]] ; then
+			SDKPATH=/
+		else
+			SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
+			if [[ ! -e ${SDKPATH} ]] ; then
+				SDKPATH=$(xcodebuild -showsdks | sort -nr \
+					| grep -o "macosx.*" | head -n1)
+				SDKPATH=$(xcode-select -print-path)/SDKs/MacOSX${SDKPATH#macosx}.sdk
+			fi
 		fi
 		( cd "${ROOT}" && ln -s "${SDKPATH}" MacOSX.sdk )
 		einfo "using system sources from ${SDKPATH}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2c9812b9969dea501dc889593e9bacd572bb01f4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 18:52:57 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 18:52:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2c9812b9

scripts/bootstrap-prefix: find OS matching SDK on Darwin

For some reason Apple installs SDKs for the next versions of the OS
automatically, and then enables those SDKs.  Doing so, however results
in mismatches between the running system and the SDK, such as finding
definitions of symbols, but not being able to resolve them during
runtime.

Try and find an SDK that matches the running OS, in the hope that things
match better.

Bug: https://bugs.gentoo.org/910720
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9e2c9ca8ce..91463681fe 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -443,6 +443,19 @@ bootstrap_profile() {
 			SDKPATH=/
 		else
 			SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
+			if [[ -L ${SDKPATH} ]] ; then
+				# try and find a matching OS SDK
+				local fsdk=$(readlink -f "${SDKPATH}")
+				local osvers=$(sw_vers -productVersion)
+				if [[ ${osvers%%.*} -le 10 ]] ; then
+					osvers=$(echo ${osvers} | cut -d'.' -f1-2)
+				else
+					osvers=${osvers%%.*}
+				fi
+				fsdk=${fsdk%/MacOSX*.sdk}
+				fsdk=${fsdk}/MacOSX${osvers}.sdk
+				[[ -e ${fsdk} ]] && SDKPATH=${fsdk}
+			fi
 			if [[ ! -e ${SDKPATH} ]] ; then
 				SDKPATH=$(xcodebuild -showsdks | sort -nr \
 					| grep -o "macosx.*" | head -n1)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2f78608740da9ba4dda7194f2696d64a1fb90fef
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 11:32:54 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 11:32:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2f786087

scripts/bootstrap-prefix: some refinements for Darwin 9

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 91463681fe..5fdf93beeb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -174,7 +174,13 @@ configure_toolchain() {
 		*darwin*:1)
 			einfo "Triggering Darwin with GCC toolchain"
 			compiler_stage1+=" sys-apps/darwin-miscutils"
-			local ccvers="$(unset CHOST; /usr/bin/gcc --version 2>/dev/null)"
+			# check if we have gcc-4.2 available, else use plain gcc
+			# Darwin 9 comes with 4.2 but it isn't enabled by default
+			if [[ -e $(type -P gcc-4.2) ]] ; then
+				CC=gcc-4.2
+				CXX=g++-4.2
+			fi
+			local ccvers="$(unset CHOST; ${CC} --version 2>/dev/null)"
 			local isgcc=
 			case "${ccvers}" in
 				*"(GCC) 4.2.1 "*)
@@ -214,7 +220,7 @@ configure_toolchain() {
 			# https://bugs.gentoo.org/show_bug.cgi?id=538366
 			compiler_stage1="sys-apps/darwin-miscutils"
 			compiler_type="clang"
-			local ccvers="$(unset CHOST; /usr/bin/gcc --version 2>/dev/null)"
+			local ccvers="$(unset CHOST; ${CC} --version 2>/dev/null)"
 			local llvm_deps="dev-build/ninja"
 			case "${ccvers}" in
 				*"Apple clang version "*|*"Apple LLVM version "*)
@@ -1239,8 +1245,10 @@ bootstrap_zlib() {
 }
 
 bootstrap_libffi() {
+	# 3.0.8: last version to bootstrap on Darwin 9 x86
 	bootstrap_gnu libffi 3.3 || \
-	bootstrap_gnu libffi 3.2.1
+	bootstrap_gnu libffi 3.2.1 || \
+	bootstrap_gnu libffi 3.0.8
 }
 
 bootstrap_sed() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     377f6f4e9776170245bbf4fe908032b69c9a9d01
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  2 12:05:58 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 12:05:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=377f6f4e

scripts/bootstrap-prefix: fix configure_toolchain for Darwin

Don't get confused by (just) bootstrapped compilers, in fact, drop the
detection of host-compilers, because they are insufficient to bootstrap
nowadays.

Bug: https://bugs.gentoo.org/923617
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5fdf93beeb..4622dc5d3e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -166,6 +166,8 @@ configure_toolchain() {
 	# introduced in gcc-4.8, but apparently gcc-5 is still buildable
 	# with Apple's gcc-apple-4.0.1, so that's a good candidate
 	# The Prefix tree only contains gcc-12 as of this writing.
+	# The bootstrap Python 3.7 we have in use requires C11, so Apple's
+	# 4.x line is no longer enough for that.
 
 	CC=gcc
 	CXX=g++
@@ -174,26 +176,19 @@ configure_toolchain() {
 		*darwin*:1)
 			einfo "Triggering Darwin with GCC toolchain"
 			compiler_stage1+=" sys-apps/darwin-miscutils"
-			# check if we have gcc-4.2 available, else use plain gcc
-			# Darwin 9 comes with 4.2 but it isn't enabled by default
-			if [[ -e $(type -P gcc-4.2) ]] ; then
-				CC=gcc-4.2
-				CXX=g++-4.2
-			fi
 			local ccvers="$(unset CHOST; ${CC} --version 2>/dev/null)"
 			local isgcc=
 			case "${ccvers}" in
-				*"(GCC) 4.2.1 "*)
-					linker="=sys-devel/binutils-apple-3.2.6"
-					isgcc=true
-					;;
-				*"(GCC) 4.0.1 "*)
-					linker="=sys-devel/binutils-apple-3.2.6"
-					# upgrade to 4.2.1 first
-					compiler_stage1+="
-						sys-devel/gcc-apple
-						=sys-devel/binutils-apple-3.2.6"
-					isgcc=true
+				*"(GCC) "[1-9]*|"gcc ("*") "[1-9]*)
+					local cvers="${ccvers#*)}"; cvers="${cvers%%.*}"
+					# GCC-5 has C11 see above
+					if [[ ${ccvers} -ge 5 ]] ; then
+						linker="=sys-devel/binutils-apple-3.2.6"
+						isgcc=true
+					else
+						eerror "compiler ${ccvers} is too old: ${cvers} < 5"
+						eerror "you need a C11/C++11 compiler to bootstrap"
+					fi
 					;;
 				*"Apple clang version "*|*"Apple LLVM version "*)
 					# recent binutils-apple are hard to build (C++11

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     885a6df29cfa5e73483f33c05fef8dac3f7ec55a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  2 12:13:02 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 12:13:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=885a6df2

scripts/bootstrap-prefix: change CPU usage suggestion for modern hardware

Previous cap of 8 was based on old T1/T2.  Nowadays we can use more.

Suggest something along the lines of 50-75% of available CPUs to stay on
the modest side.  The user can override this in any case.

Closes: https://bugs.gentoo.org/923617
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4622dc5d3e..5cb6d9f265 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2565,12 +2565,9 @@ EOF
 	esac
 	# get rid of excess spaces (at least Solaris wc does)
 	ncpu=$((ncpu + 0))
-	# Suggest usage of 100% to 60% of the available CPUs in the range
-	# from 1 to 14.  We limit to no more than 8, since we easily flood
-	# the bus on those heavy-core systems and only slow down in that
-	# case anyway.
-	local tcpu=$((ncpu / 2 + 1))
-	[[ ${tcpu} -gt 8 ]] && tcpu=8
+	# Suggest usage of 50% to 75% of the available CPUs
+	[[ ${tcpu} -eq 0 ]] && tcpu=1
+	local tcpu=$((((ncpu * 3) + 1) / 4))
 	[[ -n ${USE_CPU_CORES} ]] && tcpu=${USE_CPU_CORES}
 	cat << EOF
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f672ae1a6838b926591e3df63821ab1dd58006ae
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  2 12:28:03 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 12:28:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f672ae1a

scripts/bootstrap-prefix: simplify/cleanup configure_toolchain for Darwin

Remove outdated logic, go with current systems and requirements.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5cb6d9f265..2a0274f9f3 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -176,38 +176,36 @@ configure_toolchain() {
 		*darwin*:1)
 			einfo "Triggering Darwin with GCC toolchain"
 			compiler_stage1+=" sys-apps/darwin-miscutils"
+			compiler_stage1+=" sys-devel/gcc"
+			# recent binutils-apple are hard to build (C++11 features,
+			# and cmake build system) so avoid going there, the system
+			# ld on machines with compiler that supports C11 is good
+			# enough to bring us to stage3, after which the @system set
+			# will take care of the rest
+			linker="sys-devel/native-cctools"
+
 			local ccvers="$(unset CHOST; ${CC} --version 2>/dev/null)"
-			local isgcc=
 			case "${ccvers}" in
 				*"(GCC) "[1-9]*|"gcc ("*") "[1-9]*)
 					local cvers="${ccvers#*)}"; cvers="${cvers%%.*}"
 					# GCC-5 has C11 see above
 					if [[ ${ccvers} -ge 5 ]] ; then
-						linker="=sys-devel/binutils-apple-3.2.6"
-						isgcc=true
+						: # ok!
 					else
+						# FIXME: should probably stage1 bootstrap GCC-5
+						# or something
 						eerror "compiler ${ccvers} is too old: ${cvers} < 5"
 						eerror "you need a C11/C++11 compiler to bootstrap"
 					fi
 					;;
 				*"Apple clang version "*|*"Apple LLVM version "*)
-					# recent binutils-apple are hard to build (C++11
-					# features, and cmake build system) so avoid going
-					# there, the system ld is good enough to bring us to
-					# stage3, after which the @system set will take care of
-					# the rest
-					linker=sys-devel/native-cctools
+					: # ok!
 					;;
 				*)
 					eerror "unknown compiler: ${ccvers}"
 					return 1
 					;;
 			esac
-			# current compiler (gcc-12) requires C++11, which is
-			# available since 4.8, but we don't have versions in the
-			# tree any more to bootstrap up to this -- so fail
-			# FIXME: should probably stage1 bootstrap GCC-5 or something
-			compiler_stage1+=" sys-devel/gcc"
 			;;
 		*-darwin*)
 			einfo "Triggering Darwin with LLVM/Clang toolchain"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e4dfe7e9f9241656a7ac21d61fb467843f19b362
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  4 19:13:40 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb  4 19:13:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e4dfe7e9

scripts/bootstrap-prefix: bump snapshot to 20240203

Gets up to emerge @system stage so assuming it's ok.  Makes clang-lld
profile available for bootstraps.

PR: https://github.com/gentoo/gentoo/pull/35042
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2a0274f9f3..1bbcd7cdb9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -558,7 +558,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240121"
+	local PV="20240203"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c682495fd80c201f1323907aecfbe642debb005d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  5 18:39:42 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb  5 18:40:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c682495f

scripts/bootstrap-prefix: bootstrap GCC-5 on Darwin 9

This is sufficient to compile Python, and should be sufficient to
compile GCC-13.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 64 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1bbcd7cdb9..5f6d8b7db4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -189,7 +189,7 @@ configure_toolchain() {
 				*"(GCC) "[1-9]*|"gcc ("*") "[1-9]*)
 					local cvers="${ccvers#*)}"; cvers="${cvers%%.*}"
 					# GCC-5 has C11 see above
-					if [[ ${ccvers} -ge 5 ]] ; then
+					if [[ ${cvers} -ge 5 ]] ; then
 						: # ok!
 					else
 						# FIXME: should probably stage1 bootstrap GCC-5
@@ -866,6 +866,27 @@ bootstrap_gnu() {
 		myconf="${myconf} --disable-perl-regexp"
 	fi
 
+	if [[ ${PN} == "mpfr" || ${PN} == "mpc" || ${PN} == "gcc" ]] ; then
+		[[ -e "${ROOT}"/tmp/usr/include/gmp.h ]] \
+			&& myconf="${myconf} --with-gmp=${ROOT}/tmp/usr"
+	fi
+	if [[ ${PN} == "mpc" || ${PN} == "gcc" ]] ; then
+		[[ -e "${ROOT}"/tmp/usr/include/mpfr.h ]] \
+			&& myconf="${myconf} --with-mpfr=${ROOT}/tmp/usr"
+	fi
+	if [[ ${PN} == "gcc" ]] ; then
+		[[ -e "${ROOT}"/tmp/usr/include/mpc.h ]] \
+			&& myconf="${myconf} --with-mpc=${ROOT}/tmp/usr"
+
+		myconf="${myconf} --enable-languages=c,c++"
+		myconf="${myconf} --disable-bootstrap"
+		myconf="${myconf} --disable-multilib"
+		myconf="${myconf} --disable-nls"
+
+		export CFLAGS="-O1 -pipe"
+		export CXXFLAGS="-O1 -pipe"
+	fi
+
 	# pod2man may be too old (not understanding --utf8) but we don't
 	# care about manpages at this stage
 	export ac_cv_path_POD2MAN=no
@@ -1244,6 +1265,23 @@ bootstrap_libffi() {
 	bootstrap_gnu libffi 3.0.8
 }
 
+bootstrap_gmp() {
+	bootstrap_gnu gmp 6.2.1
+}
+
+bootstrap_mpfr() {
+	bootstrap_gnu mpfr 4.1.0
+}
+
+bootstrap_mpc() {
+	bootstrap_gnu mpc 1.2.1
+}
+
+bootstrap_gcc5() {
+	# bootstraps with gcc-4.0.1 (Darwin 8), provides C11
+	bootstrap_gnu gcc 5.5.0
+}
+
 bootstrap_sed() {
 	bootstrap_gnu sed 4.5 || \
 	bootstrap_gnu sed 4.2.2 || bootstrap_gnu sed 4.2.1
@@ -1399,6 +1437,27 @@ bootstrap_stage1() {
 		[[ -e ${ROOT}/tmp/${x} ]] || ( cd "${ROOT}"/tmp && ln -s usr/${x} )
 	done
 
+	# we could check compiler version here, but we just know
+	# it's Darwin 8 and 9 being affected here, so handle them to
+	# get a GCC-5 which is sufficient to compile the current tree
+	# packages
+	# see also configure_toolchain
+	if [[ ${CHOST} == *-darwin[89] ]] ; then
+		# benefit from 4.2 if it's present
+		if [[ -e /usr/bin/gcc-4.2 ]] ; then
+			export CC=gcc-4.2
+			export CXX=g++-4.2
+		fi
+		[[ -e ${ROOT}/tmp/usr/include/gmp.h ]] \
+			|| (bootstrap_gmp) || return 1
+		[[ -e ${ROOT}/tmp/usr/include/mpfr.h ]] \
+			|| (bootstrap_mpfr) || return 1
+		[[ -e ${ROOT}/tmp/usr/include/mpc.h ]] \
+			|| (bootstrap_mpc) || return 1
+		[[ -x ${ROOT}/tmp/usr/bin/gcc ]] \
+			|| (bootstrap_gcc5) || return 1
+	fi
+
 	configure_toolchain
 	export CC CXX
 
@@ -1456,7 +1515,7 @@ bootstrap_stage1() {
 		|| (bootstrap_grep) || return 1
 	[[ -x ${ROOT}/tmp/usr/bin/gawk ]] \
 		|| [[ $(awk --version < /dev/null 2>&1) == *GNU" Awk "[456789]* ]] \
-		|| bootstrap_gawk || return 1
+		|| (bootstrap_gawk) || return 1
 	# always build our own bash, for we don't know what devilish thing
 	# we're working with now, bug #650284
 	[[ -x ${ROOT}/tmp/usr/bin/bash ]] \
@@ -1514,6 +1573,7 @@ bootstrap_stage1() {
 			fi
 			;;
 	esac
+
 	# Host compiler can output a variety of libdirs.  At stage1,
 	# they should be the same as lib.  Otherwise libffi may not be
 	# found by python.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     472b8f58661c072823b086a0ce29431b9b724ad1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  5 19:30:21 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb  5 19:30:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=472b8f58

scripts/bootstrap-prefix: bring back Darwin 9 x86 support

Use ppc-macos as base for this, as it's just an aid.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5f6d8b7db4..c59ff0cd9c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -299,6 +299,16 @@ bootstrap_setup() {
 				echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
 			[[ ${OFFLINE_MODE} ]] && \
 				echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
+
+			if [[ ${CHOST} == i*86-apple-darwin9 ]] ; then
+				# There's no legitimate reason to use 10.5 with x86 (10.6 and
+				# 10.7 run on every device that ever ran 10.5 x86) but it's
+				# vastly easier to access and faster than ppc.  Don't want to
+				# burden the tree with this aid-arch, so just use the ppc
+				# keyword.
+				echo
+				echo 'ACCEPT_KEYWORDS="~ppc-macos"'
+			fi
 		} > "${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf"
 	fi
 
@@ -357,6 +367,10 @@ bootstrap_profile() {
 			rev=${CHOST##*darwin}
 			profile="prefix/darwin/macos/10.$((rev - 4))/ppc"
 			;;
+		i*86-apple-darwin9)
+			rev=${CHOST##*darwin}
+			profile="prefix/darwin/macos/10.$((rev - 4))/x32"
+			;;
 		i*86-apple-darwin1[578])
 			eerror "REMOVED ARCH: this 32-bit MacOS architecture was removed,"
 			eerror "bootstrapping is impossible"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     24f011b46fa26a9e15153dd45a4be3ea5be46ca7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  5 19:50:47 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb  5 19:50:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=24f011b4

scripts/bootstrap-prefix: fix Darwin 9 x86 profile typo

x32 is something different from x86, not sure why I got confused

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c59ff0cd9c..676fe5ec0a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -369,7 +369,7 @@ bootstrap_profile() {
 			;;
 		i*86-apple-darwin9)
 			rev=${CHOST##*darwin}
-			profile="prefix/darwin/macos/10.$((rev - 4))/x32"
+			profile="prefix/darwin/macos/10.$((rev - 4))/x86"
 			;;
 		i*86-apple-darwin1[578])
 			eerror "REMOVED ARCH: this 32-bit MacOS architecture was removed,"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a58e5f266d9b62816405cbb1e8d0beb281b97edb
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  6 13:15:52 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 13:15:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a58e5f26

scripts/bootstrap-prefix: pull in libffi as part of the compiler

We need an updated linker to compile libffi on Darwin 9, so make libffi
part of the compiler dependencies, such that we can build the linker
first, and then finish libffi.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 676fe5ec0a..9a65ccf4fc 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -112,6 +112,9 @@ efetch() {
 
 configure_cflags() {
 	export CPPFLAGS="-I${ROOT}/tmp/usr/include"
+	# keep it fairly reasonable (no -march or whatever)
+	export OVERRIDE_CFLAGS="-O2 -pipe"
+	export OVERRIDE_CXXFLAGS="-O2 -pipe"
 
 	case ${CHOST} in
 		*-darwin*)
@@ -151,7 +154,7 @@ configure_cflags() {
 
 configure_toolchain() {
 	linker="sys-devel/binutils"
-	local gcc_deps="dev-libs/gmp dev-libs/mpfr dev-libs/mpc"
+	local gcc_deps="dev-libs/gmp dev-libs/mpfr dev-libs/mpc dev-libs/libffi"
 	compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc"
 	compiler_stage1="${gcc_deps} sys-devel/gcc-config"
 	compiler_type="gcc"
@@ -190,7 +193,8 @@ configure_toolchain() {
 					local cvers="${ccvers#*)}"; cvers="${cvers%%.*}"
 					# GCC-5 has C11 see above
 					if [[ ${cvers} -ge 5 ]] ; then
-						: # ok!
+						: # ok! stage1 bootstrapped one, get us a linker too
+						linker="=sys-devel/binutils-apple-3.2.6*"
 					else
 						# FIXME: should probably stage1 bootstrap GCC-5
 						# or something
@@ -1846,7 +1850,6 @@ bootstrap_stage2() {
 		app-arch/xz-utils
 		sys-apps/sed
 		sys-apps/baselayout
-		dev-libs/libffi
 		sys-devel/m4
 		sys-devel/flex
 		sys-apps/diffutils # needed by bison-3 build system
@@ -1904,7 +1907,7 @@ bootstrap_stage2() {
 		EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both) --with-local-prefix=${ROOT} ${disable_darwin_rpath}" \
 		MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 		GCC_MAKE_TARGET=all \
-		OVERRIDE_CXXFLAGS="${CPPFLAGS} -O2 -pipe" \
+		OVERRIDE_CXXFLAGS="${CPPFLAGS} ${OVERRIDE_CXXFLAGS}" \
 		TPREFIX="${ROOT}" \
 		PYTHON_COMPAT_OVERRIDE=python$(python_ver) \
 		emerge_pkgs --nodeps ${pkg} || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ae290517d47b26295c46a1bca0fbdcfdee5bb1a8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 08:44:29 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 08:44:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ae290517

scripts/bootstrap-prefix: unbreak arm64-macos bootstrap

Trim down the guessing and more in configure_toolchain.

Problem is that configure_toolchain is called in all three stages, and
its output is used.  Since we need to bootstrap a compiler very early,
we need to rely on PATH for a compiler, which means in stage3 we always
pick up the stage2 emerged compiler.  This changes the output of the
function due to a change in env.

Avoid this by simply hardwiring the exceptional case, which is already
hardwired before already.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9a65ccf4fc..86ec75ee9f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -180,34 +180,20 @@ configure_toolchain() {
 			einfo "Triggering Darwin with GCC toolchain"
 			compiler_stage1+=" sys-apps/darwin-miscutils"
 			compiler_stage1+=" sys-devel/gcc"
-			# recent binutils-apple are hard to build (C++11 features,
-			# and cmake build system) so avoid going there, the system
-			# ld on machines with compiler that supports C11 is good
-			# enough to bring us to stage3, after which the @system set
-			# will take care of the rest
-			linker="sys-devel/native-cctools"
 
-			local ccvers="$(unset CHOST; ${CC} --version 2>/dev/null)"
-			case "${ccvers}" in
-				*"(GCC) "[1-9]*|"gcc ("*") "[1-9]*)
-					local cvers="${ccvers#*)}"; cvers="${cvers%%.*}"
-					# GCC-5 has C11 see above
-					if [[ ${cvers} -ge 5 ]] ; then
-						: # ok! stage1 bootstrapped one, get us a linker too
-						linker="=sys-devel/binutils-apple-3.2.6*"
-					else
-						# FIXME: should probably stage1 bootstrap GCC-5
-						# or something
-						eerror "compiler ${ccvers} is too old: ${cvers} < 5"
-						eerror "you need a C11/C++11 compiler to bootstrap"
-					fi
-					;;
-				*"Apple clang version "*|*"Apple LLVM version "*)
-					: # ok!
+			# binutils-apple/xtools doesn't work (yet) on arm64.  The
+			# profiles will mask and keep using native-cctools for that,
+			# otherwise stage3 and @system will take care of switching
+			# to binutils-apple.
+			# one problem: when we have a really old linker, we need
+			# to use it sooner or else packages like libffi won't
+			# compile.
+			case ${CHOST} in
+				*-darwin[89])
+					linker="=sys-devel/binutils-apple-3.2.6*"
 					;;
 				*)
-					eerror "unknown compiler: ${ccvers}"
-					return 1
+					linker="sys-devel/native-cctools"
 					;;
 			esac
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e66a8e81b12473d92c7fadb361feffb2aa127d9e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 10:17:13 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 10:17:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e66a8e81

scripts/bootstrap-prefix: catch any riscv tuple #923410

Thanks Julián.

Bug: https://bugs.gentoo.org/923410
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 86ec75ee9f..27ea905467 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -385,7 +385,7 @@ bootstrap_profile() {
 		i*86-pc-linux-gnu)
 			profile=${profile_linux/ARCH/x86}
 			;;
-		riscv64-pc-linux-gnu)
+		riscv64-*-linux-gnu)
 			profile=${profile_linux/ARCH/riscv}
 			profile=${profile/17.0/20.0/rv64gc/lp64d}
 			;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7c5f8c46bba64f4338a6976222758193e394076f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 14:08:48 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 14:08:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7c5f8c46

scripts/bootstrap-prefix: bootstrap findutils-4.9

Previous versions have dissapeared from Gentoo mirrors, so use latest
one if possible.

Thanks Daniel Weiß for pointing this out.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 27ea905467..4b4cd52b90 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1292,6 +1292,7 @@ bootstrap_sed() {
 }
 
 bootstrap_findutils() {
+	bootstrap_gnu findutils 4.9.0 ||
 	bootstrap_gnu findutils 4.7.0 ||
 	bootstrap_gnu findutils 4.5.10 ||
 	bootstrap_gnu findutils 4.2.33

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b0e14d5272b26404dc62299f5c8866a1cb4ddb4b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 18:38:08 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 18:38:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b0e14d52

scripts/bootstrap-prefix: bootstrap XZ version available on mirrors

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4b4cd52b90..bd168b6f3e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1377,6 +1377,7 @@ bootstrap_gzip() {
 }
 
 bootstrap_xz() {
+	GNU_URL=http://tukaani.org/xz bootstrap_gnu xz 5.4.5 || \
 	GNU_URL=http://tukaani.org/xz bootstrap_gnu xz 5.2.4 || \
 	GNU_URL=http://tukaani.org/xz bootstrap_gnu xz 5.2.3
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7cda6224d12a9cf15358bf4c610e0befdb9a894e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 20:03:10 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 20:03:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7cda6224

scripts/bootstrap-bash: default to prefix redirector for GLEP 57

Bug: https://bugs.gentoo.org/921541
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-bash.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-bash.sh b/scripts/bootstrap-bash.sh
index b24015fc19..c67d8943b7 100755
--- a/scripts/bootstrap-bash.sh
+++ b/scripts/bootstrap-bash.sh
@@ -18,7 +18,7 @@ cd "$1"
 mkdir bash-build
 cd bash-build
 
-GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org/distfiles"}
+GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.prefix.bitzolder.nl/distfiles"}
 
 command_exists() {
 	check_cmd="$1"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     17d5502169f13bc2cb1fa6cc86b704c86ebf8d29
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 18:44:08 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 18:44:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=17d55021

scripts/bootstrap-prefix: bump snapshot

Get Darwin9 x86 and clang profiles

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index bd168b6f3e..9c371f32eb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -562,7 +562,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240203"
+	local PV="20240218"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2740fcd07fe8cd8d75af9cc05bfb9970159bf8db
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 09:42:28 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 09:55:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2740fcd0

scripts/bootstrap-prefix: add identification in stageX.log files

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9c371f32eb..349a81876d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1644,6 +1644,12 @@ bootstrap_stage1() {
 }
 
 bootstrap_stage1_log() {
+	{
+		echo "===== stage 1 -- $(date -u +%Y-%m-%dT%H:%M:%SZ) ====="
+		echo "CHOST:     ${CHOST}"
+		echo "IDENT:     ${CHOST_IDENTIFY}"
+		echo "==========================================="
+	} >> ${ROOT}/stage1.log
 	bootstrap_stage1 "${@}" 2>&1 | tee -a ${ROOT}/stage1.log
 	local ret=${PIPESTATUS[0]}
 	[[ ${ret} == 0 ]] && touch ${ROOT}/.stage1-finished
@@ -1942,6 +1948,12 @@ bootstrap_stage2() {
 }
 
 bootstrap_stage2_log() {
+	{
+		echo "===== stage 2 -- $(date -u +%Y-%m-%dT%H:%M:%SZ) ====="
+		echo "CHOST:     ${CHOST}"
+		echo "IDENT:     ${CHOST_IDENTIFY}"
+		echo "==========================================="
+	} >> ${ROOT}/stage2.log
 	bootstrap_stage2 "${@}" 2>&1 | tee -a ${ROOT}/stage2.log
 	local ret=${PIPESTATUS[0]}
 	[[ ${ret} == 0 ]] && touch "${ROOT}/.stage2-finished"
@@ -2289,6 +2301,12 @@ bootstrap_stage3() {
 }
 
 bootstrap_stage3_log() {
+	{
+		echo "===== stage 3 -- $(date -u +%Y-%m-%dT%H:%M:%SZ) ====="
+		echo "CHOST:     ${CHOST}"
+		echo "IDENT:     ${CHOST_IDENTIFY}"
+		echo "==========================================="
+	} >> ${ROOT}/stage3.log
 	bootstrap_stage3 "${@}" 2>&1 | tee -a ${ROOT}/stage3.log
 	local ret=${PIPESTATUS[0]}
 	[[ ${ret} == 0 ]] && touch "${ROOT}/.stage3-finished"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ca158662df56bb58d15a876ba1141dd7e808a628
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 09:49:39 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 09:55:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ca158662

scripts/bootstrap-prefix: avoid final emerge -e @system

Long time ago, when we started bootstraps, all stages were done straight
into the destination Prefix, which meant tools could link to the host
and/or configured in an odd way where packages would refer to (config)
files from the host.  To make sure all of that was set straight, the
blunt tool emerge -e @system was run as last step to make sure
everything came from Portage proper.

Today, we bootstrap in early stages in EPREFIX/tmp and even set up a
Portage instance there that will use tools that may or may not come from
host or be configured to use it.  However, it cleanly pulls itself out
of the mud by letting Portage install @system in the destination Prefix,
thus it compiles every package it needs with the requirements as set out
by the ebuilds.

Thus there is no need to really recompile everything all over again.  It
should be fine with a simple recompile of all packages for which
USE-flags changed after we lifted some overrides to avoid circular or
unnecessary deps.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 349a81876d..0612b7af5d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1734,8 +1734,8 @@ do_emerge_pkgs() {
 
 		# Disable the STALE warning because the snapshot frequently gets stale.
 		#
-		# Need need to spam the user about news until the emerge -e system
-		# because the tools aren't available to read the news item yet anyway.
+		# No need to spam the user about news until the final emerge @world
+		# because the tools aren't available to read the news items yet anyway.
 		#
 		# Avoid circular deps caused by the default profiles (and IUSE
 		# defaults).
@@ -2279,9 +2279,10 @@ bootstrap_stage3() {
 	export USE="-git -crypt -http2"
 
 	# Portage should figure out itself what it needs to do, if anything.
-	einfo "running emerge -uDNv system"
-	estatus "stage3: emerge -uDNv system"
-	emerge --color n -uDNv system || return 1
+	eflags="--deep --update --changed-use @system"
+	einfo "running emerge ${eflags}"
+	estatus "stage3: emerge ${eflags}"
+	emerge --color n -v ${eflags} || return 1
 
 	# Remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"
@@ -2931,8 +2932,9 @@ OK!  I'm going to give it a try, this is what I have collected sofar:
 I'm now going to make an awful lot of noise going through a sequence of
 stages to make your box as groovy as I am myself, setting up your
 Prefix.  In short, I'm going to run stage1, stage2, stage3, followed by
-emerge -e system.  If any of these stages fail, both you and me are in
-deep trouble.  So let's hope that doesn't happen.
+an emerge to do a finel update to your system.  If any of these stages
+fail, both you and me are in deep trouble.  So let's hope that doesn't
+happen.
 EOF
 	echo
 	[[ ${TODO} == 'noninteractive' ]] && ans="" ||
@@ -3088,7 +3090,7 @@ EOF
 
 	[[ ${STOP_BOOTSTRAP_AFTER} == stage3 ]] && exit 0
 
-	local cmd="emerge -v -e system"
+	local cmd="emerge -v --deep --update --changed-use @world"
 	if [[ -e ${EPREFIX}/var/cache/edb/mtimedb ]] && \
 		grep -q resume "${EPREFIX}"/var/cache/edb/mtimedb ;
 	then
@@ -3096,7 +3098,7 @@ EOF
 	fi
 	einfo "running ${cmd}"
 	if ${cmd} ; then
-		# Now, after 'emerge -e system', we can get rid of the temporary tools.
+		# Now, we've got everything in $ROOT, we can get rid of /tmp
 		if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then
 			rm -Rf "${EPREFIX}"/tmp || return 1
 			mkdir -p "${EPREFIX}"/tmp || return 1
@@ -3104,7 +3106,7 @@ EOF
 
 		hash -r  # tmp/* stuff is removed in stage3
 	else
-		# emerge -e system fail
+		# emerge @world fail
 		cat << EOF
 
 Oh yeah, I thought I was almost there, and then this!  I did

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     864b5204957f5f02757aca7e80e60330c67d0ab9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 14:52:59 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 14:52:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=864b5204

scripts/bootstrap-prefix: fix typo

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0612b7af5d..3f5a25f6f7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2932,7 +2932,7 @@ OK!  I'm going to give it a try, this is what I have collected sofar:
 I'm now going to make an awful lot of noise going through a sequence of
 stages to make your box as groovy as I am myself, setting up your
 Prefix.  In short, I'm going to run stage1, stage2, stage3, followed by
-an emerge to do a finel update to your system.  If any of these stages
+an emerge to do a final update to your system.  If any of these stages
 fail, both you and me are in deep trouble.  So let's hope that doesn't
 happen.
 EOF

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fa7c24ebb3b27299fd2195d4e821c8c615c02eec
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 14:41:38 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 14:41:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fa7c24eb

scripts/bootstrap-bash: shellcheck

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-bash.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-bash.sh b/scripts/bootstrap-bash.sh
index c67d8943b7..db9d8c2795 100755
--- a/scripts/bootstrap-bash.sh
+++ b/scripts/bootstrap-bash.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2006-2018 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 2006-2024 Gentoo Authors; Distributed under the GPL v2
 
 # bash installer
 #
@@ -14,15 +14,15 @@ if [ -z "$1" ] ; then
 fi
 
 mkdir -p "$1"
-cd "$1"
+cd "$1" || exit 1
 mkdir bash-build
-cd bash-build
+cd bash-build || exit 1
 
 GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.prefix.bitzolder.nl/distfiles"}
 
 command_exists() {
 	check_cmd="$1"
-	command -v $check_cmd >/dev/null 2>&1
+	command -v "${check_cmd}" >/dev/null 2>&1
 }
 
 same_file() {
@@ -40,7 +40,7 @@ if [ ! -e bash-4.2.tar.gz ] ; then
 	eerror() { echo "!!! $*" 1>&2; }
 	einfo() { echo "* $*"; }
 
-	if [ -z ${FETCH_COMMAND} ] ; then
+	if [ -z "${FETCH_COMMAND}" ] ; then
 		# Try to find a download manager, we only deal with wget,
 		# curl, FreeBSD's fetch and ftp.
 		if command_exists wget; then
@@ -65,7 +65,7 @@ if [ ! -e bash-4.2.tar.gz ] ; then
 					;;
 			esac
 		fi
-		if [ -z ${FETCH_COMMAND} ]; then
+		if [ -z "${FETCH_COMMAND}" ]; then
 			eerror "no suitable download manager found (need wget, curl, fetch or ftp)"
 			eerror "could not download ${1##*/}"
 			eerror "download the file manually, and put it in ${PWD}"
@@ -77,7 +77,7 @@ fi
 
 gzip -d bash-4.2.tar.gz
 tar -xf bash-4.2.tar
-cd bash-4.2
+cd bash-4.2 || exit 2
 
 ./configure --prefix="${1}"/usr --disable-nls
 make

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fc8ff18f3a1a54c592dcfdb3a5c0a514de6f0ad7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 11:51:23 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 11:51:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fc8ff18f

scripts/bootstrap-prefix: fix Gentoo host shortcut path

Thanks flow for pointing out.

Closes: https://bugs.gentoo.org/927957
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c3daad42ca..cb15d53cd6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1591,8 +1591,10 @@ bootstrap_stage1() {
 
 	# Host compiler can output a variety of libdirs.  At stage1,
 	# they should be the same as lib.  Otherwise libffi may not be
-	# found by python.
-	if is-rap ; then
+	# found by python.  Don't do this when we're using a Gentoo host to
+	# speed up bootstrapping, it should be good, and we shouldn't be
+	# touching the host either.  Bug #927957
+	if is-rap && [[ ! -L "${ROOT}"/tmp ]] ; then
 		[[ -d ${ROOT}/tmp/usr/lib ]] || mkdir -p "${ROOT}"/tmp/usr/lib
 		local libdir
 		for libdir in lib64 lib32 libx32; do

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     6d11c0bf665e15ee3393ffb92ca03214f73003b3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 11:45:34 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 11:45:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6d11c0bf

scripts/bootstrap-prefix: shellcheck

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 93 ++++++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 43 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6440b4563e..c3daad42ca 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -58,7 +58,7 @@ efetch() {
 
 		if [[ ${OFFLINE_MODE} ]] ; then
 			echo "I need ${1##*/} from $1 in $DISTDIR, can you give it to me?"
-			read
+			read -r
 			[[ -e ${DISTDIR}/${1##*/} ]] && return 0
 			# Give fetch a try
 		fi
@@ -66,15 +66,15 @@ efetch() {
 		if [[ -z ${FETCH_COMMAND} ]] ; then
 			# Try to find a download manager, we only deal with wget,
 			# curl, FreeBSD's fetch and ftp.
-			if [[ x$(type -t wget) == "xfile" ]] ; then
+			if [[ $(type -t wget) == "file" ]] ; then
 				FETCH_COMMAND="wget"
 				[[ $(wget -h) == *"--no-check-certificate"* ]] \
 					&& FETCH_COMMAND+=" --no-check-certificate"
-			elif [[ x$(type -t curl) == "xfile" ]] ; then
+			elif [[ $(type -t curl) == "file" ]] ; then
 				FETCH_COMMAND="curl -f -L -O"
-			elif [[ x$(type -t fetch) == "xfile" ]] ; then
+			elif [[ $(type -t fetch) == "file" ]] ; then
 				FETCH_COMMAND="fetch"
-			elif [[ x$(type -t ftp) == "xfile" ]] ; then
+			elif [[ $(type -t ftp) == "file" ]] ; then
 				FETCH_COMMAND="ftp"
 			else
 				eerror "no suitable download manager found!"
@@ -86,7 +86,7 @@ efetch() {
 
 		einfo "Fetching ${1##*/}"
 		estatus "stage1: fetching ${1##*/}"
-		pushd "${DISTDIR}" > /dev/null
+		pushd "${DISTDIR}" > /dev/null || exit 1
 
 		# Try for mirrors first, fall back to distfiles, then try given location
 		local locs=( )
@@ -107,7 +107,7 @@ efetch() {
 			eerror "downloading ${1} failed!"
 			return 1
 		fi
-		popd > /dev/null
+		popd > /dev/null || exit 1
 	fi
 	return 0
 }
@@ -311,7 +311,7 @@ bootstrap_setup() {
 			else
 				getent passwd > "${ROOT}"/etc/passwd
 				# add user if it's not in /etc/passwd, bug #766417
-				getent passwd $(id -un) >> "${ROOT}"/etc/passwd
+				getent passwd "$(id -un)" >> "${ROOT}"/etc/passwd
 			fi
 		fi
 		if [[ ! -f ${ROOT}/etc/group ]]; then
@@ -320,7 +320,7 @@ bootstrap_setup() {
 			else
 				getent group > "${ROOT}"/etc/group
 				# add group if it's not in /etc/group, bug #766417
-				getent group $(id -gn) >> "${ROOT}"/etc/group
+				getent group "$(id -gn)" >> "${ROOT}"/etc/group
 			fi
 		fi
 		[[ -f ${ROOT}/etc/resolv.conf ]] || ln -s {,"${ROOT}"}/etc/resolv.conf
@@ -331,10 +331,11 @@ bootstrap_setup() {
 }
 
 bootstrap_profile() {
-	local profile=""
+	local profile
+	local profile_linux
 
 	# 2.6.32.1 -> 2*256^3 + 6*256^2 + 32 * 256 + 1 = 33955841
-	kver() { uname -r|cut -d\- -f1|awk -F. '{for (i=1; i<=NF; i++){s+=lshift($i,(4-i)*8)};print s}'; }
+	kver() { uname -r|cut -d- -f1|awk -F. '{for (i=1; i<=NF; i++){s+=lshift($i,(4-i)*8)};print s}'; }
 	# >=glibc-2.20 requires >=linux-2.6.32.
 	profile-kernel() {
 		if [[ $(kver) -ge 50462720 ]] ; then # 3.2
@@ -349,9 +350,9 @@ bootstrap_profile() {
 	}
 
 	if is-rap ; then
-		local profile_linux=default/linux/ARCH/17.0/prefix/$(profile-kernel)
+		profile_linux="default/linux/ARCH/17.0/prefix/$(profile-kernel)"
 	else
-		local profile_linux=prefix/linux/ARCH
+		profile_linux="prefix/linux/ARCH"
 	fi
 
 	case ${CHOST} in
@@ -449,9 +450,11 @@ bootstrap_profile() {
 		else
 			SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
 			if [[ -L ${SDKPATH} ]] ; then
+				local fsdk
+				local osvers
 				# try and find a matching OS SDK
-				local fsdk=$(readlink -f "${SDKPATH}")
-				local osvers=$(sw_vers -productVersion)
+				fsdk="$(readlink -f "${SDKPATH}")"
+				osvers="$(sw_vers -productVersion)"
 				if [[ ${osvers%%.*} -le 10 ]] ; then
 					osvers=$(echo ${osvers} | cut -d'.' -f1-2)
 				else
@@ -545,18 +548,19 @@ do_tree() {
 		# latest tree cannot be fetched from mirrors, always have to
 		# respect the source to get the latest
 		if [[ -n ${LATEST_TREE_YES} ]] ; then
-			( export GENTOO_MIRRORS= DISTFILES_G_O= DISTFILES_PFX= ;
+			( export GENTOO_MIRRORS='' DISTFILES_G_O='' DISTFILES_PFX='' ;
 			  efetch "$1/$2" ) || return 1
 		else
 			# use only Prefix mirror
-			( export GENTOO_MIRRORS= DISTFILES_G_O= ;
+			( export GENTOO_MIRRORS='' DISTFILES_G_O='' ;
 			  efetch "$1/$2" ) || return 1
 		fi
 		einfo "Unpacking, this may take a while"
 		estatus "stage1: unpacking Portage tree"
-		bzip2 -dc ${DISTDIR}/$2 | tar -xf - -C ${PORTDIR} --strip-components=1
+		bzip2 -dc "${DISTDIR}/$2" \
+			| tar -xf - -C "${PORTDIR}" --strip-components=1
 		[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
-		touch ${PORTDIR}/.unpacked
+		touch "${PORTDIR}"/.unpacked
 	fi
 }
 
@@ -607,8 +611,10 @@ bootstrap_startscript() {
 	einfo "To start Gentoo Prefix, run the script ${ROOT}/startprefix"
 
 	# see if PATH is kept/respected
-	local minPATH="preamble:${BASH%/*}:postlude"
-	local theirPATH="$(echo 'echo "${PATH}"' | env LS_COLORS= PATH="${minPATH}" $SHELL -l 2>/dev/null | grep "preamble:.*:postlude")"
+	local minPATH
+	local theirPATH
+	minPATH="preamble:${BASH%/*}:postlude"
+	theirPATH="$(echo 'echo "${PATH}"' | env LS_COLORS= PATH="${minPATH}" $SHELL -l 2>/dev/null | grep "preamble:.*:postlude")"
 	if [[ ${theirPATH} != *"preamble:"*":postlude"* ]] ; then
 		einfo "WARNING: your shell initialisation (.cshrc, .bashrc, .profile)"
 		einfo "         seems to overwrite your PATH, this effectively kills"
@@ -647,11 +653,11 @@ bootstrap_portage() {
 	ptmp=${S}
 	rm -rf "${S}" >& /dev/null
 	mkdir -p "${S}" >& /dev/null
-	cd "${S}"
+	cd "${S}" || return 1
 	bzip2 -dc "${DISTDIR}/${A}" | tar -xf -
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}/prefix-portage-${PV}"
-	cd "${S}"
+	cd "${S}" || return 1
 
 	fix_config_sub
 
@@ -686,7 +692,7 @@ bootstrap_portage() {
 	einfo "Installing ${A%.tar.*}"
 	emake install || return 1
 
-	cd "${ROOT}"
+	cd "${ROOT}" || return 1
 	rm -Rf ${ptmp} >& /dev/null
 
 	# Some people will skip the tree() step and hence var/log is not created
@@ -696,7 +702,7 @@ bootstrap_portage() {
 	# in Prefix the sed wrapper is deadly, so kill it
 	rm -f "${ROOT}"/tmp/usr/lib/portage/bin/ebuild-helpers/sed
 
-	local tmpportdir=${ROOT}/tmp/${PORTDIR#${ROOT}}
+	local tmpportdir=${ROOT}/tmp/${PORTDIR#"${ROOT}"}
 	[[ -e "${tmpportdir}" ]] || ln -s "${PORTDIR}" "${tmpportdir}"
 	for d in "${ROOT}"/tmp/usr/lib/python$(python_ver); do
 		[[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/portage ${d}/portage
@@ -718,6 +724,7 @@ fix_config_sub() {
 	# for various versions of autoconf
 	if [[ ${CHOST} == arm64-apple-darwin* ]] ; then
 		# Apple Silicon doesn't use aarch64, but arm64
+		# note: macOS /usr/bin/find knows no -print0 or -exec
 		find . -name "config.sub" | \
 			xargs sed -i -e 's/ arm\(-\*\)* / arm\1 | arm64\1 /'
 		find . -name "config.sub" | \
@@ -737,8 +744,8 @@ bootstrap_simple() {
 	einfo "Unpacking ${A%.tar.*}"
 	S="${PORTAGE_TMPDIR}/${PN}-${PV}"
 	rm -rf "${S}"
-	mkdir -p "${S}"
-	cd "${S}"
+	mkdir -p "${S}" || return 1
+	cd "${S}" || return 1
 	case $3 in
 		xz)    decomp=xz    ;;
 		bz2)   decomp=bzip2 ;;
@@ -747,7 +754,7 @@ bootstrap_simple() {
 	${decomp} -dc "${DISTDIR}"/${A} | tar -xf -
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/${PN}-${PV}
-	cd "${S}"
+	cd "${S}" || return 1
 
 	fix_config_sub
 
@@ -766,7 +773,7 @@ bootstrap_simple() {
 	einfo "Installing ${A%.tar.*}"
 	emake PREFIX="${ROOT}"/tmp/usr install || return 1
 
-	cd "${ROOT}"
+	cd "${ROOT}" || return 1
 	rm -Rf "${S}"
 	einfo "${A%.tar.*} successfully bootstrapped"
 }
@@ -798,8 +805,8 @@ bootstrap_gnu() {
 		einfo "Unpacking ${A%.tar.*}"
 		S="${PORTAGE_TMPDIR}/${PN}-${PV}"
 		rm -rf "${S}"
-		mkdir -p "${S}"
-		cd "${S}"
+		mkdir -p "${S}" || return 1
+		cd "${S}" || return 1
 		case ${t} in
 			tar.xz)  decomp=xz    ;;
 			tar.bz2) decomp=bzip2 ;;
@@ -1004,8 +1011,8 @@ bootstrap_python() {
 	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/python-${PV}"
 	rm -rf "${S}"
-	mkdir -p "${S}"
-	cd "${S}"
+	mkdir -p "${S}" || return 1
+	cd "${S}" || return 1
 	case ${A} in
 		*bz2) bzip2 -dc "${DISTDIR}"/${A} | tar -xf - ;;
 		*xz)  xz -dc "${DISTDIR}"/${A} | tar -xf -    ;;
@@ -1013,7 +1020,7 @@ bootstrap_python() {
 	esac
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/Python-${PV%%-*}
-	cd "${S}"
+	cd "${S}" || return 1
 	rm -rf Modules/_ctypes/libffi* || return 1
 	rm -rf Modules/zlib || return 1
 
@@ -1125,7 +1132,7 @@ bootstrap_python() {
 	#   configure to not find them using HAS_HG (TODO: obsolete?)
 	# - Do not find libffi via pkg-config using PKG_CONFIG
 	HAS_HG=no \
-	PKG_CONFIG= \
+	PKG_CONFIG='' \
 	econf \
 		--with-system-ffi \
 		--without-ensurepip \
@@ -1137,9 +1144,9 @@ bootstrap_python() {
 
 	einfo "Installing ${A%.tar.*}"
 	emake -k install || echo "??? Python failed to install *sigh* continuing anyway"
-	cd "${ROOT}"/tmp/usr/bin
+	cd "${ROOT}"/tmp/usr/bin || return 1
 	ln -sf python${PV%.*} python
-	cd "${ROOT}"/tmp/usr/lib
+	cd "${ROOT}"/tmp/usr/lib || return 1
 	# messes up python emerges, and shouldn't be necessary for anything
 	# http://forums.gentoo.org/viewtopic-p-6890526.html
 	rm -f libpython${PV%.*}.a
@@ -1159,12 +1166,12 @@ bootstrap_cmake_core() {
 	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/cmake-${PV}"
 	rm -rf "${S}"
-	mkdir -p "${S}"
-	cd "${S}"
+	mkdir -p "${S}" || return 1
+	cd "${S}" || return 1
 	gzip -dc "${DISTDIR}"/${A} | tar -xf -
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/cmake-${PV}
-	cd "${S}"
+	cd "${S}" || return 1
 
 	# don't set a POSIX standard, system headers don't like that, #757426
 	sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
@@ -1211,8 +1218,8 @@ bootstrap_zlib_core() {
 	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/zlib-${PV}"
 	rm -rf "${S}"
-	mkdir -p "${S}"
-	cd "${S}"
+	mkdir -p "${S}" || return 1
+	cd "${S}" || return 1
 	case ${A} in
 		*.tar.gz) decomp=gzip  ;;
 		*)        decomp=bzip2 ;;
@@ -1220,7 +1227,7 @@ bootstrap_zlib_core() {
 	${decomp} -dc "${DISTDIR}"/${A} | tar -xf -
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/zlib-${PV}
-	cd "${S}"
+	cd "${S}" || return 1
 
 	if [[ ${CHOST} == x86_64-*-* || ${CHOST} == sparcv9-*-* ]] ; then
 		# 64-bits targets need zlib as library (not just to unpack),

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     27837af6735978cb95e440521fbe37861aad21ff
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 11:53:46 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 11:53:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=27837af6

stage1: allow libz to be in lib64 or something for Gentoo host shortcut

Fix by flow from PR #35 on github.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cb15d53cd6..0e3bf1ef75 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1612,7 +1612,7 @@ bootstrap_stage1() {
 	# Portage) and binutils use it
 	# note that this actually breaks the concept of stage1, this will be
 	# compiled for the target prefix
-	for zlib in ${ROOT}/tmp/usr/lib/libz.* ; do
+	for zlib in ${ROOT}/tmp/usr/lib*/libz.* ; do
 		[[ -e ${zlib} ]] && break
 		zlib=
 	done

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     c509de99f99cdd760a80dcef64e9d9051c2ca71a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 17:16:54 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 17:16:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c509de99

scripts/bootstrap-prefix: shellcheck

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 74 ++++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0e3bf1ef75..351cf89f20 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+#shellcheck disable=SC2016,SC2030,SC2038,SC2185,SC2120
 # Copyright 2006-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
@@ -200,13 +201,15 @@ configure_toolchain() {
 			esac
 			;;
 		*-darwin*)
+			local ccvers
+			local llvm_deps
 			einfo "Triggering Darwin with LLVM/Clang toolchain"
 			# for compilers choice, see bug:
 			# https://bugs.gentoo.org/show_bug.cgi?id=538366
 			compiler_stage1="sys-apps/darwin-miscutils"
 			compiler_type="clang"
-			local ccvers="$(unset CHOST; ${CC} --version 2>/dev/null)"
-			local llvm_deps="dev-build/ninja"
+			ccvers="$(unset CHOST; ${CC} --version 2>/dev/null)"
+			llvm_deps="dev-build/ninja"
 			case "${ccvers}" in
 				*"Apple clang version "*|*"Apple LLVM version "*)
 					# this is Clang, recent enough to compile recent clang
@@ -683,8 +686,8 @@ bootstrap_portage() {
 	einfo "Compiling ${A%.tar.*}"
 	econf \
 		--with-offset-prefix="${ROOT}"/tmp \
-		--with-portage-user="`id -un`" \
-		--with-portage-group="`id -gn`" \
+		--with-portage-user="$(id -un)" \
+		--with-portage-group="$(id -gn)" \
 		--with-extra-path="${PATH}" \
 		|| return 1
 	emake || return 1
@@ -980,7 +983,7 @@ bootstrap_gnu() {
 		emake install || return 1
 	fi
 
-	cd "${ROOT}"
+	cd "${ROOT}" || return 1
 	rm -Rf "${S}"
 	einfo "${A%.tar.*} successfully bootstrapped"
 }
@@ -1242,13 +1245,13 @@ bootstrap_zlib_core() {
 		# compiler to 32-bits code generation if requested here
 		export CC="${CC} -m32"
 	fi
-	local makeopts=( ${MAKEOPTS} )
+	local makeopts=()
 	# 1.2.5 suffers from a concurrency problem
-	[[ ${PV} == 1.2.5 ]] && makeopts=()
+	[[ ${PV} == 1.2.5 ]] || read -a makeopts <<< "${MAKEOPTS}"
 
 	einfo "Compiling ${A%.tar.*}"
 	CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return 1
-	MAKEOPTS=
+	MAKEOPTS=''
 	emake "${makeopts[@]}" || return 1
 
 	einfo "Installing ${A%.tar.*}"
@@ -1502,8 +1505,8 @@ bootstrap_stage1() {
 		|| [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] \
 		|| (bootstrap_m4) || return 1
 	[[ -x ${ROOT}/tmp/usr/bin/bison ]] \
-		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
-		|| [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
+		|| [[ $(bison --version 2>&1) == *"GNU Bison) "2.[3-7]* ]] \
+		|| [[ $(bison --version 2>&1) == *"GNU Bison) "[3-9]* ]] \
 		|| (bootstrap_bison) || return 1
 	if [[ ! -x ${ROOT}/tmp/usr/bin/uniq ]]; then
 		# If the system has a uniq, let's use it to test whether
@@ -1612,12 +1615,12 @@ bootstrap_stage1() {
 	# Portage) and binutils use it
 	# note that this actually breaks the concept of stage1, this will be
 	# compiled for the target prefix
-	for zlib in ${ROOT}/tmp/usr/lib*/libz.* ; do
+	for zlib in "${ROOT}"/tmp/usr/lib*/libz.* ; do
 		[[ -e ${zlib} ]] && break
 		zlib=
 	done
 	[[ -n ${zlib} ]] || (bootstrap_zlib) || return 1
-	for libffi in ${ROOT}/tmp/usr/lib*/libffi.* ; do
+	for libffi in "${ROOT}"/tmp/usr/lib*/libffi.* ; do
 		[[ -e ${libffi} ]] && break
 		libffi=
 	done
@@ -1661,9 +1664,9 @@ bootstrap_stage1_log() {
 		echo "IDENT:     ${CHOST_IDENTIFY}"
 		echo "==========================================="
 	} >> ${ROOT}/stage1.log
-	bootstrap_stage1 "${@}" 2>&1 | tee -a ${ROOT}/stage1.log
+	bootstrap_stage1 "${@}" 2>&1 | tee -a "${ROOT}"/stage1.log
 	local ret=${PIPESTATUS[0]}
-	[[ ${ret} == 0 ]] && touch ${ROOT}/.stage1-finished
+	[[ ${ret} == 0 ]] && touch "${ROOT}"/.stage1-finished
 	return ${ret}
 }
 
@@ -1682,18 +1685,18 @@ do_emerge_pkgs() {
 		else
 			vdb=${vdb}-\*
 		fi
-		for pvdb in ${EPREFIX}/var/db/pkg/${vdb%-*}-* ; do
+		for pvdb in "${EPREFIX}/var/db/pkg/${vdb%-*}"-* ; do
 			if [[ -d ${pvdb} ]] ; then
 				evdb=${pvdb##*/}
 				if [[ ${pkg} == "="* ]] ; then
 					# exact match required (* should work here)
-					[[ ${evdb} == ${vdb##*/} ]] && break
+					[[ ${evdb} == "${vdb##*/}" ]] && break
 				else
 					vdb=${vdb%-*}
 					evdb=${evdb%-r*}
 					evdb=${evdb%_p*}
 					evdb=${evdb%-*}
-					[[ ${evdb} == ${vdb#*/} ]] && break
+					[[ ${evdb} == "${vdb#*/}" ]] && break
 				fi
 			fi
 			pvdb=
@@ -1718,7 +1721,7 @@ do_emerge_pkgs() {
 			clang
 			internal-glib
 		)
-		local override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}"
+		local override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#"${ROOT}"}"
 
 		if [[ " ${USE} " == *" prefix-stack "* ]] &&
 		   [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] &&
@@ -1733,15 +1736,15 @@ do_emerge_pkgs() {
 			echo "USE=\"\${USE} ${myuse[*]}\" # by bootstrap-prefix.sh" \
 				>> "${override_make_conf_dir}/0101_bootstrap_prefix_stack.conf"
 		fi
-		myuse=" ${myuse[*]} "
+		local smyuse=" ${myuse[*]} "
 		local use
 		for use in ${USE} ; do
-			myuse=" ${myuse/ ${use} /} "
-			myuse=" ${myuse/ -${use} /} "
-			myuse=" ${myuse/ ${use#-} /} "
-			myuse+=" ${use} "
+			smyuse=" ${smyuse/ ${use} /} "
+			smyuse=" ${smyuse/ -${use} /} "
+			smyuse=" ${smyuse/ ${use#-} /} "
+			smyuse=" ${smyuse} ${use} "
 		done
-		myuse=( ${myuse} )
+		read -a myuse <<< "${smyuse}"
 
 		# Disable the STALE warning because the snapshot frequently gets stale.
 		#
@@ -1755,15 +1758,14 @@ do_emerge_pkgs() {
 			estatus "${STAGE}: emerge ${pkg}"
 			unset CFLAGS CXXFLAGS
 			[[ -n ${OVERRIDE_CFLAGS} ]] \
-				&& export CFLAGS=${OVERRIDE_CFLAGS}
+				&& export CFLAGS="${OVERRIDE_CFLAGS}"
 			[[ -n ${OVERRIDE_CXXFLAGS} ]] \
-				&& export CXXFLAGS=${OVERRIDE_CXXFLAGS}
+				&& export CXXFLAGS="${OVERRIDE_CXXFLAGS}"
 			PORTAGE_SYNC_STALE=0 \
 			FEATURES="-news ${FEATURES}" \
 			USE="${myuse[*]}" \
 			emerge --color n -v --oneshot --root-deps ${opts} "${pkg}"
-		)
-		[[ $? -eq 0 ]] || return 1
+		) || return 1
 	done
 }
 
@@ -1791,7 +1793,7 @@ bootstrap_stage2() {
 	# bison's configure checks for perl, but doesn't use it,
 	# except for tests.  Since we don't want to pull in perl at this
 	# stage, fake it
-	export PERL=$(which touch)
+	PERL="$(which touch)" ; export PERL
 	# GCC sometimes decides that it needs to run makeinfo to update some
 	# info pages from .texi files.  Obviously we don't care at this
 	# stage and rather have it continue instead of abort the build
@@ -1866,7 +1868,7 @@ bootstrap_stage2() {
 	# provide active SDK link on Darwin
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		rm -f "${ROOT}"/tmp/MacOSX.sdk
-		( cd "${ROOT}"/tmp && ln -s ../MacOSX.sdk )
+		( cd "${ROOT}"/tmp && ln -s ../MacOSX.sdk MacOSX.sdk )
 	fi
 
 	# cmake has some external dependencies which require autoconf, etc.
@@ -2014,13 +2016,15 @@ bootstrap_stage3() {
 	for pef in python{,3} python{,3}-config ; do
 		rm -f "${ROOT}"/tmp/usr/bin/${pef}
 		[[ ${pef} == *-config ]] && ppf=-config || ppf=
-		( cd "${ROOT}"/tmp/usr/bin && ln -s python$(python_ver)${ppf} ${pef} )
+		( cd "${ROOT}"/tmp/usr/bin && \
+			ln -s "python$(python_ver)${ppf}" "${pef}" )
 	done
 
 	get_libdir() {
-		local l=$(portageq envvar LIBDIR_$(portageq envvar ABI) 2>/dev/null)
+		local l
+		l="$(portageq envvar LIBDIR_$(portageq envvar ABI) 2>/dev/null)"
 		[[ -z ${l} ]] && l=lib
-		echo ${l}
+		echo "${l}"
 	}
 
 	# Remember: binutils-config and gcc were built in ROOT/tmp, so they
@@ -2030,7 +2034,7 @@ bootstrap_stage3() {
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
 	[[ ${compiler_type} == gcc ]] && \
 		export CPPFLAGS="-isystem ${ROOT}/usr/include"
-	export LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+	LDFLAGS="-L${ROOT}/usr/$(get_libdir)" ; export LDFLAGS
 	[[ ${CHOST} == *-darwin* ]] || \
 		LDFLAGS+=" -Wl,-rpath=${ROOT}/usr/$(get_libdir)"
 	unset CC CXX
@@ -2117,7 +2121,7 @@ bootstrap_stage3() {
 		# Tell dynamic loader the path of libgcc_s.so of stage2
 		if [[ ! -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf ]]; then
 			mkdir -p "${ROOT}"/etc/ld.so.conf.d
-			dirname $(gcc -print-libgcc-file-name) \
+			dirname "$(gcc -print-libgcc-file-name)" \
 				> "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 		fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b117cb02bf01f1db7244db5b569cc9d7d32ca866
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 11:46:31 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 11:46:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b117cb02

scripts/bootstrap-prefix: shellcheck

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 69 ++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 351cf89f20..6276ccb8d6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1250,7 +1250,7 @@ bootstrap_zlib_core() {
 	[[ ${PV} == 1.2.5 ]] || read -a makeopts <<< "${MAKEOPTS}"
 
 	einfo "Compiling ${A%.tar.*}"
-	CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return 1
+	CHOST='' ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return 1
 	MAKEOPTS=''
 	emake "${makeopts[@]}" || return 1
 
@@ -2022,7 +2022,7 @@ bootstrap_stage3() {
 
 	get_libdir() {
 		local l
-		l="$(portageq envvar LIBDIR_$(portageq envvar ABI) 2>/dev/null)"
+		l="$(portageq envvar "LIBDIR_$(portageq envvar ABI)" 2>/dev/null)"
 		[[ -z ${l} ]] && l=lib
 		echo "${l}"
 	}
@@ -2092,6 +2092,8 @@ bootstrap_stage3() {
 		cp -a "${ROOT}"{/tmp,}/usr/share/portage
 	fi
 
+	read -a linker_pkgs <<< "${linker}"
+
 	if is-rap ; then
 		# We need ${ROOT}/usr/bin/perl to merge glibc.
 		if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then
@@ -2156,10 +2158,10 @@ bootstrap_stage3() {
 		pkgs=(
 			sys-devel/binutils-config
 			sys-libs/zlib
-			${linker}
+			"${linker_pkgs[@]}"
 		)
 		# use the new dynamic linker in place of rpath from now on.
-		RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9] | sed s"!${ROOT}/$(get_libdir)/ld-lsb.*!!")
+		RAP_DLINKER=$(echo "${ROOT}/$(get_libdir)"/ld*.so.[0-9] | sed s"!${ROOT}/$(get_libdir)/ld-lsb.*!!")
 		export CPPFLAGS="--sysroot=${ROOT}"
 		export LDFLAGS="-Wl,--dynamic-linker=${RAP_DLINKER}"
 		# make sure these flags are used even in places that ignore/strip CPPFLAGS/LDFLAGS
@@ -2189,7 +2191,7 @@ bootstrap_stage3() {
 			sys-devel/flex
 			sys-devel/binutils-config
 			sys-libs/zlib
-			${linker}
+			"${linker_pkgs[@]}"
 		)
 
 		pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
@@ -2209,9 +2211,9 @@ bootstrap_stage3() {
 	# setup for a scenario where python doesn't live in the target
 	# prefix and no helpers are available
 	( cd "${ROOT}"/usr/bin && test ! -e python && \
-		ln -s "${ROOT}"/tmp/usr/bin/python$(python_ver) )
+		ln -s "${ROOT}/tmp/usr/bin/python$(python_ver)" "python$(python_ver)" )
 	# in addition, avoid collisions
-	rm -Rf "${ROOT}"/tmp/usr/lib/python$(python_ver)/site-packages/clang
+	rm -Rf "${ROOT}/tmp/usr/lib/python$(python_ver)/site-packages/clang"
 
 	# Try to get ourself out of the mud, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto --disable-bootstrap')" \
@@ -2229,7 +2231,7 @@ bootstrap_stage3() {
 	# need special care, it depends on texinfo, #717786
 	pre_emerge_pkgs --nodeps sys-apps/gawk || return 1
 
-	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python$(python_ver) )
+	( cd "${ROOT}"/usr/bin && test ! -e python && rm -f "python$(python_ver)" )
 	# Use $ROOT tools where possible from now on.
 	if [[ $(readlink "${ROOT}"/bin/sh) == "${ROOT}/tmp/"* ]] ; then
 		rm -f "${ROOT}"/bin/sh
@@ -2342,7 +2344,6 @@ set_helper_vars() {
 	GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
 	SNAPSHOT_HOST=$(rapx http://distfiles.gentoo.org http://rsync.prefix.bitzolder.nl)
 	SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
-	GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other"
 
 	export MAKE CONFIG_SHELL
 }
@@ -2656,7 +2657,7 @@ EOF
 		*-solaris*)
 			ncpu=$(/usr/sbin/psrinfo | wc -l) ;;
 		*-linux-gnu*)
-			ncpu=$(cat /proc/cpuinfo | grep processor | wc -l) ;;
+			ncpu=$(grep -c processor /proc/cpuinfo) ;;
 		*)
 			ncpu=1 ;;
 	esac
@@ -2792,7 +2793,8 @@ EOF
 
 	# Figure out if we are bootstrapping from an existing Gentoo
 	# It can be forced by setting HOST_GENTOO_EROOT manually
-	local t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> /dev/null)
+	local t_GENTOO_EROOT
+	t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> /dev/null)
 	if [[ ! -d ${HOST_GENTOO_EROOT} && -d ${t_GENTOO_EROOT} ]]; then
 		cat <<EOF
 
@@ -2893,8 +2895,10 @@ EOF
 			continue
 		fi
 		#readlink -f would not work on darwin, so use bash builtins
-		local realEPREFIX="$(cd "$EPREFIX"; pwd -P)"
-		if [[ -z ${I_KNOW_MY_GCC_WORKS_FINE_WITH_SYMLINKS} && ${EPREFIX} != ${realEPREFIX} ]]; then
+		local realEPREFIX
+		realEPREFIX=$(cd "${EPREFIX}" && pwd -P)
+		if [[ -z ${I_KNOW_MY_GCC_WORKS_FINE_WITH_SYMLINKS} && \
+			${EPREFIX} != "${realEPREFIX}" ]]; then
 			echo
 			echo "$EPREFIX contains a symlink, which will make the merge of gcc"
 			echo "imposible, use '${realEPREFIX}' instead or"
@@ -3016,7 +3020,8 @@ EOF
 	# This happens at least on 32-bits Darwin, with i386 and i686.
 	# https://bugs.gentoo.org/show_bug.cgi?id=433948
 	unset CHOST
-	export CHOST=$(portageq envvar CHOST)
+	CHOST=$(portageq envvar CHOST)
+	export CHOST
 
 	# after stage1 and stage2 we should have a bash of our own, which
 	# is preferable over the host-provided one, because we know it can
@@ -3182,8 +3187,8 @@ unset TMP TMPDIR TEMP
 # Try to guess the CHOST if not set.  We currently only support guessing
 # on a very sloppy base.
 if [[ -z ${CHOST} ]]; then
-	if [[ x$(type -t uname) == "xfile" ]]; then
-		case `uname -s` in
+	if [[ $(type -t uname) == "file" ]]; then
+		case $(uname -s) in
 			Linux)
 				CHOST=$(uname -m)
 				CHOST=${CHOST/#ppc/powerpc}
@@ -3211,7 +3216,7 @@ if [[ -z ${CHOST} ]]; then
 				esac
 				;;
 			Darwin)
-				rev="`uname -r | cut -d'.' -f 1`"
+				rev=$(uname -r | cut -d'.' -f 1)
 				if [[ ${rev} -ge 11 && ${rev} -le 19 ]] ; then
 					# Lion and up are 64-bits default (and 64-bits CPUs)
 					CHOST="x86_64-apple-darwin$rev"
@@ -3219,40 +3224,40 @@ if [[ -z ${CHOST} ]]; then
 					# uname -p returns arm, -m returns arm64 on this
 					# release while on Darwin 9 -m returns something
 					# like "PowerPC Machine", hence the distinction
-					CHOST="`uname -m`-apple-darwin$rev"
+					CHOST="$(uname -m)-apple-darwin$rev"
 				else
-					CHOST="`uname -p`-apple-darwin$rev"
+					CHOST="$(uname -p)-apple-darwin$rev"
 				fi
 				;;
 			SunOS)
-				case `uname -p` in
+				case $(uname -p) in
 					i386)
-						CHOST="i386-pc-solaris`uname -r | sed 's|5|2|'`"
+						CHOST="i386-pc-solaris$(uname -r | sed 's|5|2|')"
 					;;
 					sparc)
-						CHOST="sparc-sun-solaris`uname -r | sed 's|5|2|'`"
+						CHOST="sparc-sun-solaris$(uname -r | sed 's|5|2|')"
 					;;
 				esac
 				;;
 			CYGWIN*)
-				CHOST="`uname -m`-pc-cygwin"
+				CHOST="$(uname -m)-pc-cygwin"
 				;;
 			FreeBSD)
-				case `uname -m` in
+				case $(uname -m) in
 					amd64)
-						CHOST="x86_64-pc-freebsd`uname -r | sed 's|-.*$||'`"
+						CHOST="x86_64-pc-freebsd$(uname -r | sed 's|-.*$||')"
 					;;
 				esac
 				;;
 			OpenBSD)
-				case `uname -m` in
+				case $(uname -m) in
 					amd64)
-						CHOST="x86_64-pc-openbsd`uname -r | sed 's|-.*$||'`"
+						CHOST="x86_64-pc-openbsd$(uname -r | sed 's|-.*$||')"
 					;;
 				esac
 				;;
 			*)
-				eerror "Nothing known about platform `uname -s`."
+				eerror "Nothing known about platform $(uname -s)."
 				eerror "Please set CHOST appropriately for your system"
 				eerror "and rerun $0"
 				exit 1
@@ -3282,7 +3287,7 @@ if [[ ${CHOST} == *-linux-* ]] ; then
 	# a rolling distro
 	if [[ ${dist,,} == "gentoo" ]] ; then
 		rel=
-		[[ ${chost##*-} == "musl" ]] && rel="musl"
+		[[ ${CHOST##*-} == "musl" ]] && rel="musl"
 	fi
 
 	# leave rel unset/empty if we don't know about it
@@ -3301,13 +3306,13 @@ fi
 case ${CHOST} in
 	*-*-solaris*)
 		if type -P gmake > /dev/null ; then
-			MAKE=gmake
+			MAKE="gmake"
 		else
-			MAKE=make
+			MAKE="make"
 		fi
 	;;
 	*)
-		MAKE=make
+		MAKE="make"
 	;;
 esac
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     fac47bdfea3b3ecd54abd87cc7ee9ca653aad5f7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 12:13:25 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 12:13:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fac47bdf

scripts/bootstrap-prefix: shellcheck

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6276ccb8d6..2e4f542440 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#shellcheck disable=SC2016,SC2030,SC2038,SC2185,SC2120
+#shellcheck disable=SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
 # Copyright 2006-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
@@ -43,7 +43,8 @@ emake() {
 	else
 		estatus "stage1: building ${PWD##*/}"
 	fi
-	v "${MAKE}" ${MAKEOPTS} "$@" || return 1
+	read -a makeopts <<< "${MAKEOPTS}"
+	v "${MAKE}" "${makeopts[@]}" "$@" || return 1
 }
 
 efetch() {
@@ -100,8 +101,9 @@ efetch() {
 		done
 		locs=( "${locs[@]}" "$1" )
 
+		read -a fetchcmd <<< "${FETCH_COMMAND}"
 		for loc in "${locs[@]}" ; do
-			v ${FETCH_COMMAND} "${loc}" < /dev/null
+			v "${fetchcmd[@]}" "${loc}" < /dev/null
 			[[ -f ${1##*/} ]] && break
 		done
 		if [[ ! -f ${1##*/} ]] ; then
@@ -459,7 +461,7 @@ bootstrap_profile() {
 				fsdk="$(readlink -f "${SDKPATH}")"
 				osvers="$(sw_vers -productVersion)"
 				if [[ ${osvers%%.*} -le 10 ]] ; then
-					osvers=$(echo ${osvers} | cut -d'.' -f1-2)
+					osvers=$(echo "${osvers}" | cut -d'.' -f1-2)
 				else
 					osvers=${osvers%%.*}
 				fi
@@ -604,7 +606,7 @@ bootstrap_startscript() {
 	fi
 	einfo "Trying to emerge the shell you use, if necessary by running:"
 	einfo "emerge -u ${theshell}"
-	if ! emerge -u ${theshell} ; then
+	if ! emerge -u "${theshell}" ; then
 		eerror "Your shell is not available in portage, hence we cannot" > /dev/stderr
 		eerror "automate starting your prefix, set SHELL and rerun this script" > /dev/stderr
 		return 1
@@ -617,7 +619,7 @@ bootstrap_startscript() {
 	local minPATH
 	local theirPATH
 	minPATH="preamble:${BASH%/*}:postlude"
-	theirPATH="$(echo 'echo "${PATH}"' | env LS_COLORS= PATH="${minPATH}" $SHELL -l 2>/dev/null | grep "preamble:.*:postlude")"
+	theirPATH="$(echo 'echo "${PATH}"' | env LS_COLORS= PATH="${minPATH}" "${SHELL}" -l 2>/dev/null | grep "preamble:.*:postlude")"
 	if [[ ${theirPATH} != *"preamble:"*":postlude"* ]] ; then
 		einfo "WARNING: your shell initialisation (.cshrc, .bashrc, .profile)"
 		einfo "         seems to overwrite your PATH, this effectively kills"
@@ -649,7 +651,7 @@ bootstrap_portage() {
 	A=prefix-portage-${PV}.tar.bz2
 	einfo "Bootstrapping ${A%.tar.*}"
 
-	efetch ${DISTFILES_URL}/${A} || return 1
+	efetch "${DISTFILES_URL}/${A}" || return 1
 
 	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}"/portage-${PV}
@@ -696,7 +698,7 @@ bootstrap_portage() {
 	emake install || return 1
 
 	cd "${ROOT}" || return 1
-	rm -Rf ${ptmp} >& /dev/null
+	rm -Rf "${ptmp}" >& /dev/null
 
 	# Some people will skip the tree() step and hence var/log is not created
 	# As such, portage complains..
@@ -708,8 +710,8 @@ bootstrap_portage() {
 	local tmpportdir=${ROOT}/tmp/${PORTDIR#"${ROOT}"}
 	[[ -e "${tmpportdir}" ]] || ln -s "${PORTDIR}" "${tmpportdir}"
 	for d in "${ROOT}"/tmp/usr/lib/python$(python_ver); do
-		[[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/portage ${d}/portage
-		[[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/_emerge ${d}/_emerge
+		[[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/portage "${d}"/portage
+		[[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/_emerge "${d}"/_emerge
 	done
 
 	if [[ -s ${PORTDIR}/profiles/repo_name ]]; then
@@ -742,7 +744,7 @@ bootstrap_simple() {
 	A=${PN}-${PV}.tar.${3:-gz}
 	einfo "Bootstrapping ${A%.tar.*}"
 
-	efetch ${4:-${DISTFILES_G_O}/distfiles}/${A} || return 1
+	efetch "${4:-${DISTFILES_G_O}/distfiles}/${A}" || return 1
 
 	einfo "Unpacking ${A%.tar.*}"
 	S="${PORTAGE_TMPDIR}/${PN}-${PV}"
@@ -750,11 +752,12 @@ bootstrap_simple() {
 	mkdir -p "${S}" || return 1
 	cd "${S}" || return 1
 	case $3 in
+		zstd)  decomp=zstd  ;;
 		xz)    decomp=xz    ;;
 		bz2)   decomp=bzip2 ;;
 		gz|"") decomp=gzip  ;;
 	esac
-	${decomp} -dc "${DISTDIR}"/${A} | tar -xf -
+	${decomp} -dc "${DISTDIR}/${A}" | tar -xf -
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/${PN}-${PV}
 	cd "${S}" || return 1
@@ -764,12 +767,16 @@ bootstrap_simple() {
 	# for libressl, only provide static lib, such that wget (above)
 	# links it in and we don't have to bother about RPATH or something
 	if [[ ${PN} == "libressl" ]] ; then
-		myconf="${myconf} --enable-static --disable-shared"
+		myconf=(
+			"${myconf[@]}"
+			--enable-static
+			--disable-shared
+		)
 	fi
 
 	einfo "Compiling ${A%.tar.*}"
 	if [[ -x configure ]] ; then
-		econf ${myconf} || return 1
+		econf "${myconf[@]}" || return 1
 	fi
 	emake || return 1
 
@@ -788,6 +795,7 @@ bootstrap_gnu() {
 
 	einfo "Bootstrapping ${A%.tar.*}"
 
+	# GNU does not use zstd (yet?)
 	for t in tar.xz tar.bz2 tar.gz tar ; do
 		A=${PN}-${PV}.${t}
 
@@ -815,7 +823,7 @@ bootstrap_gnu() {
 			tar.bz2) decomp=bzip2 ;;
 			tar.gz)  decomp=gzip  ;;
 			tar)
-				tar -xf "${DISTDIR}"/${A} || continue
+				tar -xf "${DISTDIR}/${A}" || continue
 				break
 				;;
 			*)
@@ -823,7 +831,7 @@ bootstrap_gnu() {
 				return 1
 				;;
 		esac
-		${decomp} -dc "${DISTDIR}"/${URL##*/} | tar -xf -
+		${decomp} -dc "${DISTDIR}/${URL##*/}" | tar -xf -
 		[[ ${PIPESTATUS[*]} == '0 0' ]] || continue
 		break
 	done

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     9473056957f34a82c177b7b42cd0c0617f43bdc5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 12:38:01 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 12:38:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=94730569

scripts/bootstrap-prefix: shellcheck

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 15e2c1098e..447f81274c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#shellcheck disable=SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
+#shellcheck disable=SCSC1091,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
 # Copyright 2006-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
@@ -1088,8 +1088,6 @@ bootstrap_python() {
 
 	fix_config_sub
 
-	local myconf=""
-
 	case ${CHOST} in
 	(x86_64-*-*|sparcv9-*-*)
 		export CFLAGS="-m64"
@@ -1103,7 +1101,9 @@ bootstrap_python() {
 		*-linux*)
 			# Bug 382263: make sure Python will know about the libdir in use for
 			# the current arch
-			libdir="-L/usr/lib/$(gcc ${CFLAGS} -print-multi-os-directory)"
+			local -a flgarg
+			read -r -a flgarg <<< "${CFLAGS}"
+			libdir="-L/usr/lib/$(gcc "${flgarg[@]}" -print-multi-os-directory)"
 		;;
 		x86_64-*-solaris*|sparcv9-*-solaris*)
 			# Like above, make Python know where GCC's 64-bits
@@ -1157,7 +1157,7 @@ bootstrap_python() {
 		--disable-ipv6 \
 		--disable-shared \
 		--libdir="${ROOT}"/tmp/usr/lib \
-		${myconf} || return 1
+		|| return 1
 	emake || return 1
 
 	einfo "Installing ${A%.tar.*}"
@@ -1178,7 +1178,7 @@ bootstrap_cmake_core() {
 
 	einfo "Bootstrapping ${A%.tar.*}"
 
-	efetch https://github.com/Kitware/CMake/releases/download/v${PV}/${A} \
+	efetch "https://github.com/Kitware/CMake/releases/download/v${PV}/${A}" \
 		|| return 1
 
 	einfo "Unpacking ${A%.tar.*}"
@@ -1186,7 +1186,7 @@ bootstrap_cmake_core() {
 	rm -rf "${S}"
 	mkdir -p "${S}" || return 1
 	cd "${S}" || return 1
-	gzip -dc "${DISTDIR}"/${A} | tar -xf -
+	gzip -dc "${DISTDIR}/${A}" | tar -xf -
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/cmake-${PV}
 	cd "${S}" || return 1
@@ -1212,10 +1212,10 @@ bootstrap_cmake_core() {
 	# later on, so kill it in the installed version
 	ver=${A%-*} ; ver=${ver%.*}
 	sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-		"${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-GNU-*.cmake || die
+		"${ROOT}/tmp/usr/share/${ver}/Modules/Platform"/Apple-GNU-*.cmake || die
 	# disable isysroot usage with clang as well
 	sed -i -e '/_SYSROOT_FLAG/d' \
-		"${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-Clang.cmake || die
+		"${ROOT}/tmp/usr/share/${ver}/Modules/Platform"/Apple-Clang.cmake || die
 
 	einfo "${A%.tar.*} bootstrapped"
 }
@@ -1231,7 +1231,7 @@ bootstrap_zlib_core() {
 
 	einfo "Bootstrapping ${A%.tar.*}"
 
-	efetch ${DISTFILES_G_O}/distfiles/${A} || return 1
+	efetch "${DISTFILES_G_O}/distfiles/${A}" || return 1
 
 	einfo "Unpacking ${A%.tar.*}"
 	export S="${PORTAGE_TMPDIR}/zlib-${PV}"
@@ -1242,7 +1242,7 @@ bootstrap_zlib_core() {
 		*.tar.gz) decomp=gzip  ;;
 		*)        decomp=bzip2 ;;
 	esac
-	${decomp} -dc "${DISTDIR}"/${A} | tar -xf -
+	${decomp} -dc "${DISTDIR}/${A}" | tar -xf -
 	[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
 	S="${S}"/zlib-${PV}
 	cd "${S}" || return 1
@@ -1356,7 +1356,7 @@ bootstrap_make() {
 	bootstrap_gnu make 4.2.1 || return 1
 	if [[ ${MAKE} == gmake ]] ; then
 		# make make available as gmake
-		( cd ${ROOT}/tmp/usr/bin && ln -s make gmake )
+		( cd "${ROOT}"/tmp/usr/bin && ln -s make gmake )
 	fi
 }
 
@@ -1464,7 +1464,7 @@ bootstrap_stage1() {
 
 	# See comments in do_tree().
 	local portroot=${PORTDIR%/*}
-	mkdir -p "${ROOT}"/tmp/${portroot#${ROOT}/}
+	mkdir -p "${ROOT}/tmp/${portroot#"${ROOT}"/}"
 	for x in lib sbin bin; do
 		mkdir -p "${ROOT}"/tmp/usr/${x}
 		[[ -e ${ROOT}/tmp/${x} ]] || ( cd "${ROOT}"/tmp && ln -s usr/${x} )
@@ -1678,11 +1678,11 @@ bootstrap_stage1_log() {
 		echo "CHOST:     ${CHOST}"
 		echo "IDENT:     ${CHOST_IDENTIFY}"
 		echo "==========================================="
-	} >> ${ROOT}/stage1.log
+	} >> "${ROOT}"/stage1.log
 	bootstrap_stage1 "${@}" 2>&1 | tee -a "${ROOT}"/stage1.log
 	local ret=${PIPESTATUS[0]}
 	[[ ${ret} == 0 ]] && touch "${ROOT}"/.stage1-finished
-	return ${ret}
+	return "${ret}"
 }
 
 do_emerge_pkgs() {
@@ -1770,6 +1770,15 @@ do_emerge_pkgs() {
 		# defaults).
 		echo "USE=${myuse[*]} PKG=${pkg}"
 		(
+			local -a eopts
+			read -r -a eopts <<< "${opts}"
+			eopts=(
+				"--color" "n"
+				"-v"
+				"--oneshot"
+				"--root-deps"
+				"${eopts[@]}"
+			)
 			estatus "${STAGE}: emerge ${pkg}"
 			unset CFLAGS CXXFLAGS
 			[[ -n ${OVERRIDE_CFLAGS} ]] \
@@ -1779,7 +1788,7 @@ do_emerge_pkgs() {
 			PORTAGE_SYNC_STALE=0 \
 			FEATURES="-news ${FEATURES}" \
 			USE="${myuse[*]}" \
-			emerge --color n -v --oneshot --root-deps ${opts} "${pkg}"
+			emerge "${eopts[@]}" "${pkg}"
 		) || return 1
 	done
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8c71637fe91262dc2cdd948fe47c35c665c65eb2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 12:39:22 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 12:39:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8c71637f

scripts/bootstrap-prefix: bleh, fix shellcheck

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 447f81274c..ab724b4c70 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#shellcheck disable=SCSC1091,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
+#shellcheck disable=SC1091,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
 # Copyright 2006-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     081349d858e3f82f2a61ce72ce04f8664f08ca2e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 12:51:01 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 12:51:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=081349d8

scripts/bootstrap-prefix: shellcheck

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 54 +++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ab724b4c70..24e10f92b7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#shellcheck disable=SC1091,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
+#shellcheck disable=SC1091,SC2015,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
 # Copyright 2006-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
@@ -1902,8 +1902,10 @@ bootstrap_stage2() {
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
 	# Debian multiarch supported by RAP needs ld to support sysroot.
-	EXTRA_ECONF=$(rapx --with-sysroot=/) \
-	emerge_pkgs --nodeps ${linker} || return 1
+	for pkg in ${linker} ; do
+		EXTRA_ECONF=$(rapx --with-sysroot=/) \
+		emerge_pkgs --nodeps "${pkg}" || return 1
+	done
 
 	# During Gentoo prefix bootstrap stage2, GCC is built with
 	# "--disable-bootstrap". For Darwin, it means that rather than letting
@@ -1941,7 +1943,7 @@ bootstrap_stage2() {
 		OVERRIDE_CXXFLAGS="${CPPFLAGS} ${OVERRIDE_CXXFLAGS}" \
 		TPREFIX="${ROOT}" \
 		PYTHON_COMPAT_OVERRIDE=python$(python_ver) \
-		emerge_pkgs --nodeps ${pkg} || return 1
+		emerge_pkgs --nodeps "${pkg}" || return 1
 
 		if [[ "${pkg}" == *sys-devel/llvm* || ${pkg} == *sys-devel/clang* ]] ;
 		then
@@ -1972,7 +1974,9 @@ bootstrap_stage2() {
 		# multilib.eclass -- can't blame it at this point really)
 		# do it ourselves here to make the bootstrap continue
 		if [[ -x "${ROOT}"/tmp/usr/bin/${CHOST}-clang ]] ; then
-			( cd "${ROOT}"/tmp/usr/bin && ln -s clang ${CHOST}-clang && ln -s clang++ ${CHOST}-clang++ )
+			( cd "${ROOT}"/tmp/usr/bin && \
+				ln -s clang "${CHOST}-clang" && \
+				ln -s clang++ "${CHOST}-clang++" )
 		fi
 	elif ! is-rap ; then
 		# make sure the EPREFIX gcc shared libraries are there
@@ -1990,11 +1994,11 @@ bootstrap_stage2_log() {
 		echo "CHOST:     ${CHOST}"
 		echo "IDENT:     ${CHOST_IDENTIFY}"
 		echo "==========================================="
-	} >> ${ROOT}/stage2.log
-	bootstrap_stage2 "${@}" 2>&1 | tee -a ${ROOT}/stage2.log
+	} >> "${ROOT}"/stage2.log
+	bootstrap_stage2 "${@}" 2>&1 | tee -a "${ROOT}"/stage2.log
 	local ret=${PIPESTATUS[0]}
 	[[ ${ret} == 0 ]] && touch "${ROOT}/.stage2-finished"
-	return ${ret}
+	return "${ret}"
 }
 
 bootstrap_stage3() {
@@ -2038,7 +2042,7 @@ bootstrap_stage3() {
 	# tmp, we basically made the system unusable, so remove python-exec
 	# here so we can use the python in tmp
 	for pef in python{,3} python{,3}-config ; do
-		rm -f "${ROOT}"/tmp/usr/bin/${pef}
+		rm -f "${ROOT}/tmp/usr/bin/${pef}"
 		[[ ${pef} == *-config ]] && ppf=-config || ppf=
 		( cd "${ROOT}"/tmp/usr/bin && \
 			ln -s "python$(python_ver)${ppf}" "${pef}" )
@@ -2084,13 +2088,13 @@ bootstrap_stage3() {
 	# packages installed end up in ROOT/tmp, which means we keep using
 	# stage2 area and config which breaks things like binutils-config'
 	# path search, so don't use this
-	with_stack_emerge_pkgs() {
-		# keep FEATURES=stacked-prefix until we bump portage in stage1
-		FEATURES="${FEATURES} stacked-prefix" \
-		USE="${USE} prefix-stack" \
-		PORTAGE_OVERRIDE_EPREFIX="${ROOT}/tmp" \
-		emerge_pkgs "$@"
-	}
+	#with_stack_emerge_pkgs() {
+	#	# keep FEATURES=stacked-prefix until we bump portage in stage1
+	#	FEATURES="${FEATURES} stacked-prefix" \
+	#	USE="${USE} prefix-stack" \
+	#	PORTAGE_OVERRIDE_EPREFIX="${ROOT}/tmp" \
+	#	emerge_pkgs "$@"
+	#}
 
 	# pre_emerge_pkgs relies on stage 2 portage, but installs into the
 	# final destination Prefix
@@ -2116,7 +2120,9 @@ bootstrap_stage3() {
 		cp -a "${ROOT}"{/tmp,}/usr/share/portage
 	fi
 
+	local -a linker_pkgs compiler_pkgs
 	read -r -a linker_pkgs <<< "${linker}"
+	read -r -a compiler_pkgs <<< "${compiler}"
 
 	if is-rap ; then
 		# We need ${ROOT}/usr/bin/perl to merge glibc.
@@ -2222,7 +2228,7 @@ bootstrap_stage3() {
 	fi
 	# remove stage2 ld so that stage3 ld is used by stage2 gcc.
 	is-rap && [[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && \
-		mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
+		mv "${ROOT}/tmp/usr/${CHOST}/bin"/ld{,.stage2}
 
 	# On some hosts, gcc gets confused now when it uses the new linker,
 	# see for instance bug #575480.  While we would like to hide that
@@ -2241,10 +2247,10 @@ bootstrap_stage3() {
 
 	# Try to get ourself out of the mud, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto --disable-bootstrap')" \
-	GCC_MAKE_TARGET=$(rapx all) \
+	GCC_MAKE_TARGET="$(rapx all)" \
 	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
-	PYTHON_COMPAT_OVERRIDE=python$(python_ver) \
-	pre_emerge_pkgs --nodeps ${compiler} || return 1
+	PYTHON_COMPAT_OVERRIDE="python$(python_ver)" \
+	pre_emerge_pkgs --nodeps "${compiler_pkgs[@]}" || return 1
 
 	# Undo libgcc_s.so path of stage2
 	# Now we have the compiler right there
@@ -2348,11 +2354,11 @@ bootstrap_stage3_log() {
 		echo "CHOST:     ${CHOST}"
 		echo "IDENT:     ${CHOST_IDENTIFY}"
 		echo "==========================================="
-	} >> ${ROOT}/stage3.log
-	bootstrap_stage3 "${@}" 2>&1 | tee -a ${ROOT}/stage3.log
+	} >> "${ROOT}"/stage3.log
+	bootstrap_stage3 "${@}" 2>&1 | tee -a "${ROOT}"/stage3.log
 	local ret=${PIPESTATUS[0]}
 	[[ ${ret} == 0 ]] && touch "${ROOT}/.stage3-finished"
-	return ${ret}
+	return "${ret}"
 }
 
 set_helper_vars() {
@@ -2403,7 +2409,7 @@ bootstrap_interactive() {
 
 EOF
 	[[ ${TODO} == 'noninteractive' ]] && ans=yes ||
-	read -p "Do you want me to start off now? [Yn] " ans
+	read -r -p "Do you want me to start off now? [Yn] " ans
 	case "${ans}" in
 		[Yy][Ee][Ss]|[Yy]|"")
 			: ;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     9aa0206b6acc8c1267e73f9e1c0d6d7daec8e3f8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 13:05:35 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 13:05:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9aa0206b

scripts/bootstrap-prefix: shellcheck

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 46 ++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 24e10f92b7..d58d58175d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1980,8 +1980,8 @@ bootstrap_stage2() {
 		fi
 	elif ! is-rap ; then
 		# make sure the EPREFIX gcc shared libraries are there
-		mkdir -p "${ROOT}"/usr/${CHOST}/lib/gcc
-		cp "${ROOT}"/tmp/usr/${CHOST}/lib/gcc/* "${ROOT}"/usr/${CHOST}/lib/gcc
+		mkdir -p "${ROOT}/usr/${CHOST}/lib/gcc"
+		cp "${ROOT}/tmp/usr/${CHOST}/lib/gcc"/* "${ROOT}/usr/${CHOST}/lib/gcc"
 	fi
 
 	estatus "stage2 finished"
@@ -2326,10 +2326,10 @@ bootstrap_stage3() {
 	export USE="-git -crypt -http2"
 
 	# Portage should figure out itself what it needs to do, if anything.
-	eflags="--deep --update --changed-use @system"
-	einfo "running emerge ${eflags}"
-	estatus "stage3: emerge ${eflags}"
-	emerge --color n -v ${eflags} || return 1
+	local eflags=( "--deep" "--update" "--changed-use" "@system" )
+	einfo "running emerge ${eflags[*]}"
+	estatus "stage3: emerge ${eflags[*]}"
+	emerge --color n -v "${eflags[@]}" || return 1
 
 	# Remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"
@@ -2462,10 +2462,10 @@ EOF
 		# note that this code is so complex because it handles both
 		# C-shell as well as *sh
 		dvar="echo \"((${flag}=\${${flag}}))\""
-		dvar="$(echo "${dvar}" | env -i HOME=$HOME $SHELL -l 2>/dev/null)"
+		dvar="$(echo "${dvar}" | env -i HOME="${HOME}" "$SHELL" -l 2>/dev/null)"
 		if [[ ${dvar} == *"((${flag}="?*"))" ]] ; then
 			badflags="${badflags} ${flag}"
-			dvar=${dvar#*((${flag}=}
+			dvar=${dvar#*"((${flag}="}
 			dvar=${dvar%%))*}
 			echo "  uh oh, ${flag}=${dvar} :("
 		else
@@ -2616,7 +2616,7 @@ necessary to add to PATH for me to find a compiler.  I start off with
 PATH=${PATH} and will add anything you give me here.
 EOF
 				[[ ${TODO} == 'noninteractive' ]] && ans="${usergcc%/gcc}" ||
-				read -p "Where can I find your compiler? [] " ans
+				read -r -p "Where can I find your compiler? [] " ans
 				case "${ans}" in
 					"")
 						: ;;
@@ -2707,7 +2707,7 @@ clue what this means, you should go with my excellent default I've
 chosen below, really!
 EOF
 	[[ ${TODO} == 'noninteractive' ]] && ans="" ||
-	read -p "How many parallel make jobs do you want? [${tcpu}] " ans
+	read -r -p "How many parallel make jobs do you want? [${tcpu}] " ans
 	case "${ans}" in
 		"")
 			MAKEOPTS="-j${tcpu}"
@@ -2794,11 +2794,11 @@ EOF
 		case "${CHOST}" in
 			x86_64-*|sparcv9-*)  # others can't do multilib, so don't bother
 				# 64-bits native
-				read -p "How many bits do you want your Prefix to target? [64] " ans
+				read -r -p "How many bits do you want your Prefix to target? [64] " ans
 				;;
 			*)
 				# 32-bits native
-				read -p "How many bits do you want your Prefix to target? [32] " ans
+				read -r -p "How many bits do you want your Prefix to target? [32] " ans
 				;;
 		esac
 		case "${ans}" in
@@ -2833,7 +2833,7 @@ really a Gentoo lover, aren't you?  Me too!  By leveraging the existing
 portage, we can save a lot of time."
 EOF
 		[[ ${TODO} == 'noninteractive' ]] && ans=no ||
-		read -p "  Do you want me to take the shortcut? [yN] " ans
+		read -r -p "  Do you want me to take the shortcut? [yN] " ans
 		case "${ans}" in
 			[Yy][Ee][Ss]|[Yy])
 				echo "Good!"
@@ -2864,7 +2864,7 @@ by default.  Of course, you can still enable testing ~amd64 for
 the packages you want, when the need arises.
 EOF
 			[[ ${TODO} == 'noninteractive' ]] && ans=yes ||
-			read -p "  Do you want to use stable Prefix? [Yn] " ans
+			read -r -p "  Do you want to use stable Prefix? [Yn] " ans
 			case "${ans}" in
 				[Yy][Ee][Ss]|[Yy]|"")
 					echo "Okay, I'll disable ~amd64 by default."
@@ -2901,7 +2901,7 @@ EOF
 		fi
 		echo
 		[[ ${TODO} == 'noninteractive' ]] && ans= ||
-		read -p "What do you want EPREFIX to be? [$EPREFIX] " ans
+		read -r -p "What do you want EPREFIX to be? [$EPREFIX] " ans
 		case "${ans}" in
 			"")
 				: ;;
@@ -2987,7 +2987,7 @@ happen.
 EOF
 	echo
 	[[ ${TODO} == 'noninteractive' ]] && ans="" ||
-	read -p "Type here what you want to wish me [luck] " ans
+	read -r -p "Type here what you want to wish me [luck] " ans
 	if [[ -n ${ans} && ${ans} != "luck" ]] ; then
 		echo "Huh?  You're not serious, are you?"
 		sleep 3
@@ -3004,7 +3004,7 @@ EOF
 	[[ -n ${SETUP_ENV_ONLY} ]] && return 0
 
 	if [[ -d ${HOST_GENTOO_EROOT} ]]; then
-		if ! [[ -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage_host_gentoo ; then
+		if ! [[ -x ${EPREFIX}/tmp/usr/lib/portage/bin/emerge ]] && ! ${BASH} "${BASH_SOURCE[0]}" "${EPREFIX}" stage_host_gentoo ; then
 			# stage host gentoo fail
 			cat << EOF
 
@@ -3060,7 +3060,7 @@ EOF
 
 	local https_needed=no
 	if ! [[ -e ${EPREFIX}/.stage2-finished ]] \
-		&& ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2_log ; then
+		&& ! ${BASH} "${BASH_SOURCE[0]}" "${EPREFIX}" stage2_log ; then
 		# stage 2 fail
 		cat << EOF
 
@@ -3101,7 +3101,7 @@ EOF
 	hash -r
 
 	if ! [[ -e ${EPREFIX}/.stage3-finished ]] \
-		&& ! bash ${BASH_SOURCE[0]} "${EPREFIX}" stage3_log ; then
+		&& ! bash "${BASH_SOURCE[0]}" "${EPREFIX}" stage3_log ; then
 		# stage 3 fail
 		hash -r  # previous cat (tmp/usr/bin/cat) may have been removed
 		cat << EOF
@@ -3181,7 +3181,7 @@ EOF
 		exit 1
 	fi
 
-	if ! bash ${BASH_SOURCE[0]} "${EPREFIX}" startscript ; then
+	if ! bash "${BASH_SOURCE[0]}" "${EPREFIX}" startscript ; then
 		# startscript fail?
 		cat << EOF
 
@@ -3326,7 +3326,7 @@ if [[ ${CHOST} == *-linux-* ]] ; then
 	done
 
 	platform=${CHOST#*-}; platform=${platform%%-*}
-	platform=$(rapx rap ${platform})
+	platform=$(rapx rap "${platform}")
 	CHOST_IDENTIFY=${CHOST%%-*}-${platform}-linux-${dist,,}${rel}
 fi
 
@@ -3442,7 +3442,7 @@ einfo "ident:  ${CHOST_IDENTIFY}"
 einfo "prefix: ${ROOT}"
 
 TODO=${2}
-if [[ ${TODO} != "noninteractive" && $(type -t bootstrap_${TODO}) != "function" ]];
+if [[ ${TODO} != "noninteractive" && $(type -t "bootstrap_${TODO}") != "function" ]];
 then
 	eerror "bootstrap target ${TODO} unknown"
 	exit 1
@@ -3477,7 +3477,7 @@ fi
 
 # call the appropriate function,
 # beware noninteractive is just a mode of interactive
-bootstrap_${TODO#non} || exit 1
+bootstrap_"${TODO#non}" || exit 1
 
 # Local Variables:
 # sh-indentation: 4

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e1aa6894580cd3c71f21adc3ff667c5223fc9a4c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 13:16:09 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 13:16:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e1aa6894

scripts/bootstrap-prefix: fix econf after shellconf

CONFIG_SHELL may be unset, so only quote it, when it is, leave it unset
otherwise

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d58d58175d..0ef1aefa3b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -25,7 +25,7 @@ v() { echo "$@"; "$@"; }
 
 econf() {
 	estatus "stage1: configuring ${PWD##*/}"
-	v "${CONFIG_SHELL}" ./configure \
+	v ${CONFIG_SHELL:+"${CONFIG_SHELL}"} ./configure \
 		--host="${CHOST}" \
 		--prefix="${ROOT}"/tmp/usr \
 		--mandir="${ROOT}"/tmp/usr/share/man \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     1152fbf41ae0e0272b8f77413d0dabb15e81ea59
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 07:13:54 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 07:16:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1152fbf4

scripts/bootstrap-prefix: bump snapshot for Darwin fixes

- binutils-config ld duplicate paths elimination
- gcc math.h fix for darwin
- openssl using --push-state --as-needed --pop-state LDFLAGS unconditional

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0ef1aefa3b..5eee608a9a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240218"
+	local PV="20240405"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     98bf92d8362aefed6b1a535e1598380b06367ec0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 06:53:31 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 06:53:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=98bf92d8

scripts/bootstrap-prefix: snapshot bump to fix Solaris bootstrap

bump for binutils-config' -rpath handling, which affects probably more
than just Solaris

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5eee608a9a..f27be96a45 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240405"
+	local PV="20240406"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     441669168f51b3b6efc403fa69f66afec6fbf86c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 08:20:54 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 08:20:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=44166916

scripts/bootstrap-prefix: bump bootstrap snapshot

fix upstream distfile change for darwin-miscutils

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f27be96a45..660d32c487 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240406"
+	local PV="20240407"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     64a78631d4bf682f8f95f87fe150accfa0d66222
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 06:59:22 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 06:59:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=64a78631

scripts/bootstrap-prefix: bump snapshot for Darwin Python fix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 660d32c487..741f6e6cde 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240407"
+	local PV="20240409"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Sam James]

commit:     b736fab642e5f3ce519c3b4618595126160e436b
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 03:36:52 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 28 12:43:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b736fab6

bootstrap-prefix: use full path for `do_emerge_pkgs`

In the stage3 bootstrap we always prefer to use tools that have been built for
stage3; to accomplish this we ensure that it is the first thing evaluated in PATH.
Unfortunately, Portage, Python, and Python-exec are often pulled into the depgraph
at some point before we're fully boostrapped. To ensure that we don't try and execute
${EPREFIX}/usr/bin/emerge before we're ready, always provide the full path to the
bootstrap Python interpreter and emerge script.

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
Closes: https://github.com/gentoo/prefix/pull/37
Signed-off-by: Sam James <sam <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 741f6e6cde..92c3ad1869 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1785,10 +1785,16 @@ do_emerge_pkgs() {
 				&& export CFLAGS="${OVERRIDE_CFLAGS}"
 			[[ -n ${OVERRIDE_CXXFLAGS} ]] \
 				&& export CXXFLAGS="${OVERRIDE_CXXFLAGS}"
+			# In the stage3 bootstrap we always prefer to use tools that have been built for
+			# stage3; to accomplish this we ensure that it is the first thing evaluated in PATH.
+			# Unfortunately, Portage, Python, and Python-exec are often pulled into the depgraph
+			# at some point before we're fully boostrapped. To ensure that we don't try and execute
+			# ${EPREFIX}/usr/bin/emerge before we're ready, always provide the full path to the
+			# bootstrap Python interpreter and emerge script.
 			PORTAGE_SYNC_STALE=0 \
 			FEATURES="-news ${FEATURES}" \
 			USE="${myuse[*]}" \
-			emerge "${eopts[@]}" "${pkg}"
+			"${EPREFIX}"/tmp/bin/python "${EPREFIX}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}"
 		) || return 1
 	done
 }
@@ -3021,7 +3027,7 @@ EOF
 			exit 1
 		fi
 	fi
-	
+
 	if ! [[ -e ${EPREFIX}/.stage1-finished ]] && ! bootstrap_stage1_log ; then
 		# stage 1 fail
 		cat << EOF

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3e9c4bbd27b03b81c8aafcf9ccabd1c6d0e7078f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 22:34:31 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon May 27 22:36:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3e9c4bbd

scripts/bootstrap-prefix: unbreak bootstraps due to silly meson dep

gentoo-functions requires meson nowadays, which cannot be bootstrapped
this early because it requires a Python that the python eclass finds
so work around this by providing a dummy gentoo/functions.sh

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 92c3ad1869..4d4202945a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1876,10 +1876,29 @@ bootstrap_stage2() {
 	# see profiles/features/prefix/standalone/profile.bashrc
 	export BOOTSTRAP_RAP_STAGE2=yes
 
+	# elt-patches needs gentoo-functions, but gentoo-functions these
+	# days needs meson to install, which requires a properly installed
+	# Python -- at this stage we don't have that
+	# so fake gentoo-functions with some dummies to make elt-patches
+	# and others install
+	if [[ ! -e "${ROOT}"/tmp/lib/gentoo/functions.sh ]] ; then
+		mkdir -p "${ROOT}"/tmp/lib/gentoo
+		cat > "${ROOT}"/tmp/lib/gentoo/functions.sh <<-EOF
+			#!${BASH}
+
+			ewarn() {
+			  echo $*
+			}
+
+			eerror() {
+			  echo "!!! $*"
+			}
+		EOF
+	fi
+
 	# Build a basic compiler and portage dependencies in $ROOT/tmp.
 	pkgs=(
 		sys-devel/gnuconfig
-		sys-apps/gentoo-functions
 		app-portage/elt-patches
 		sys-libs/ncurses
 		sys-libs/readline
@@ -2130,6 +2149,16 @@ bootstrap_stage3() {
 	read -r -a linker_pkgs <<< "${linker}"
 	read -r -a compiler_pkgs <<< "${compiler}"
 
+	# We need gentoo-functions but it meson is still a no-go, because we
+	# don't have a Python.  Why would such simple package with a silly
+	# script file need meson is beyond me.  So, we have no other way
+	# than to fake it here for the time being like in stage2.
+	if [[ ! -e "${ROOT}"/lib/gentoo/functions.sh ]] ; then
+		mkdir -p "${ROOT}"/lib/gentoo
+		cp "${ROOT}"/tmp/lib/gentoo/functions.sh \
+			"${ROOT}"/lib/gentoo/functions.sh
+	fi
+
 	if is-rap ; then
 		# We need ${ROOT}/usr/bin/perl to merge glibc.
 		if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then
@@ -2166,7 +2195,6 @@ bootstrap_stage3() {
 		pkgs=(
 			sys-devel/gnuconfig
 			sys-apps/baselayout
-			sys-apps/gentoo-functions
 			app-portage/elt-patches
 			sys-kernel/linux-headers
 			sys-libs/glibc
@@ -2218,7 +2246,6 @@ bootstrap_stage3() {
 	else
 		pkgs=(
 			sys-devel/gnuconfig
-			sys-apps/gentoo-functions
 			app-portage/elt-patches
 			app-arch/xz-utils
 			sys-apps/sed
@@ -2283,7 +2310,7 @@ bootstrap_stage3() {
 	# now we have a shell right there
 	unset CONFIG_SHELL
 
-	# Build portage and dependencies.
+	# Build portage dependencies.
 	pkgs=(
 		sys-apps/coreutils
 		sys-apps/findutils
@@ -2306,6 +2333,7 @@ bootstrap_stage3() {
 		virtual/os-headers
 		sys-devel/gettext
 		sys-apps/portage
+		sys-apps/gentoo-functions
 	)
 
 	pre_emerge_pkgs "" "${pkgs[@]}" || return 1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7032312c7616e5d19a62ada3b0bf594035bc984c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 03:21:05 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 28 03:21:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7032312c

scripts/bootstrap-prefix: attempt to fix b736fab6 do_emerge_pkgs

Use ROOT, which should be the same between stages, such that we don't
reference tmp/tmp.  Thanks huxnu for pointing out.

Bug: https://bugs.gentoo.org/933079
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4d4202945a..60f5a24347 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1785,16 +1785,20 @@ do_emerge_pkgs() {
 				&& export CFLAGS="${OVERRIDE_CFLAGS}"
 			[[ -n ${OVERRIDE_CXXFLAGS} ]] \
 				&& export CXXFLAGS="${OVERRIDE_CXXFLAGS}"
-			# In the stage3 bootstrap we always prefer to use tools that have been built for
-			# stage3; to accomplish this we ensure that it is the first thing evaluated in PATH.
-			# Unfortunately, Portage, Python, and Python-exec are often pulled into the depgraph
-			# at some point before we're fully boostrapped. To ensure that we don't try and execute
-			# ${EPREFIX}/usr/bin/emerge before we're ready, always provide the full path to the
-			# bootstrap Python interpreter and emerge script.
+			# In the stage3 bootstrap we always prefer to use tools that
+			# have been built for stage3; to accomplish this we ensure
+			# that it is the first thing evaluated in PATH.
+			# Unfortunately, Portage, Python, and Python-exec are often
+			# pulled into the depgraph at some point before we're fully
+			# boostrapped. To ensure that we don't try and execute
+			# ${EPREFIX}/usr/bin/emerge before we're ready, always
+			# provide the full path to the bootstrap Python interpreter
+			# and emerge script.
 			PORTAGE_SYNC_STALE=0 \
 			FEATURES="-news ${FEATURES}" \
 			USE="${myuse[*]}" \
-			"${EPREFIX}"/tmp/bin/python "${EPREFIX}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}"
+			"${ROOT}"/tmp/bin/python \
+			"${ROOT}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}"
 		) || return 1
 	done
 }

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     8c396749be8a540dd25315d5bdc48e764139f819
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 02:15:42 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May 30 02:15:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8c396749

scripts/bootstrap-prefix: bump bootstrap snapshot

This brings in gcc-13.3.0 which helps on macOS Sanoma, but we still
don't get up to success.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 60f5a24347..051aae6b08 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240409"
+	local PV="20240529"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     23620efb918a3fc4b077a79187c157f682d8d213
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 04:37:22 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 04:37:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=23620efb

scripts/bootstrap-prefix: bump snapshot to an existing one

Closes: https://bugs.gentoo.org/934308
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 051aae6b08..ec754a3377 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240529"
+	local PV="20240613"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     5bacf5a9ebf62155fc79c5e8b86f3332cf94deb8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 14:31:02 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 14:31:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5bacf5a9

scripts/bootstrap-prefix: bump snapshot for zstd compile-fix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ec754a3377..d62aae9b80 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240613"
+	local PV="20240617"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0c15f53abb6ee951a4381715e8cbdcc59e2e06cf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 07:04:26 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 07:04:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0c15f53a

scripts/bootstrap-prefix: bump snapshot for xz-utils fix

We need 3f4b5440ef1e9b77b465dcaf0a0e104238ff6ed8 (from bug #934515) to
make the bootstrap succeed on macOS/Darwin.

Closes: https://bugs.gentoo.org/934757
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d62aae9b80..721157f1df 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240617"
+	local PV="20240622"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     55888020536b3866ff29f27d6b4e6ede77ae791f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 13:09:51 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 13:09:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=55888020

scripts/bootstrap-prefix: define PORTAGE_INST_{UID,GID}

Based on the patch by Etienne Buira <etienne.buira <AT> free.fr> in bug #933100.

Mainline Portage doesn't set the Portage UID/GID, so define them in
make.conf during bootstrap for RAP targets.

Closes: https://bugs.gentoo.org/933100
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 721157f1df..024a77392a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -306,6 +306,15 @@ bootstrap_setup() {
 				echo
 				echo 'ACCEPT_KEYWORDS="~ppc-macos"'
 			fi
+
+			if is-rap ; then
+				# https://bugs.gentoo.org/933100
+				# mainline Portage doesn't set these like Prefix branch
+				# does, so hardwire the IDs here
+				echo
+				echo "PORTAGE_INST_UID=$(id --user)"
+				echo "PORTAGE_INST_GID=$(id --group)"
+			fi
 		} > "${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf"
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     636a653fcc42a974748a26cbf6c999592c762466
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 08:52:16 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 08:52:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=636a653f

scripts/bootstrap-prefix: use GCC-5 on all Darwin bootstraps

With recent macOS we need GCC-14 in order to make sense of system
headers.  However, GCC-14 gets confused by (older) Clang installed on
the host system.  So we need GCC-5 to get us a C11/C++11 compiler that
can compile GCC-14 to do the real work.

Unfortunately for GCC-5 to work properly on systems that do not have
/usr/{include,lib} we need wrappers such as we use in Gentoo Prefix
proper, thus part of that needs to be pulled and put in place too in
order to get correctly compiled and running binaries.

This change succeeds bootstrap on Darwin 17, 19 and 20, 21 and 22
pending.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 172 +++++++++++++++++++++++++++++++-------------
 1 file changed, 122 insertions(+), 50 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f49a595ad0..33c9feff34 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -391,9 +391,10 @@ bootstrap_profile() {
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
 		*64-apple-darwin2[0123456789])
-			# Big Sur is 11.0
+			# Big Sur is  11.0
 			# Monterey is 12.0
-			# Ventura is 13.0
+			# Ventura is  13.0
+			# Sanoma is   14.0
 			rev=${CHOST##*darwin}
 			case ${CHOST%%-*} in
 				x86_64)  arch=x64    ;;
@@ -453,44 +454,6 @@ bootstrap_profile() {
 			;;
 	esac
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# setup MacOSX.sdk symlink for GCC, this should probably be
-		# managed using an eselect module in the future
-		# FWIW, just use system (/) if it seems OK, for some reason
-		# early versions of TAPI-based SDKs did not include some symbols
-		# like fclose, which ld64 is able to resolve from the dylibs
-		# although they are unvisible using e.g. nm.
-		rm -f "${ROOT}"/MacOSX.sdk
-		local SDKPATH
-		if [[ -e /usr/lib/libSystem.B.dylib && -d /usr/include ]] ; then
-			SDKPATH=/
-		else
-			SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
-			if [[ -L ${SDKPATH} ]] ; then
-				local fsdk
-				local osvers
-				# try and find a matching OS SDK
-				fsdk="$(readlink -f "${SDKPATH}")"
-				osvers="$(sw_vers -productVersion)"
-				if [[ ${osvers%%.*} -le 10 ]] ; then
-					osvers=$(echo "${osvers}" | cut -d'.' -f1-2)
-				else
-					osvers=${osvers%%.*}
-				fi
-				fsdk=${fsdk%/MacOSX*.sdk}
-				fsdk=${fsdk}/MacOSX${osvers}.sdk
-				[[ -e ${fsdk} ]] && SDKPATH=${fsdk}
-			fi
-			if [[ ! -e ${SDKPATH} ]] ; then
-				SDKPATH=$(xcodebuild -showsdks | sort -nr \
-					| grep -o "macosx.*" | head -n1)
-				SDKPATH=$(xcode-select -print-path)/SDKs/MacOSX${SDKPATH#macosx}.sdk
-			fi
-		fi
-		( cd "${ROOT}" && ln -s "${SDKPATH}" MacOSX.sdk )
-		einfo "using system sources from ${SDKPATH}"
-	fi
-
 	if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
 		# amend profile, to use gcc one
 		profile="${profile}/gcc"
@@ -585,7 +548,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240622"
+	local PV="20240718"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
@@ -919,8 +882,16 @@ bootstrap_gnu() {
 			"--disable-bootstrap"
 			"--disable-multilib"
 			"--disable-nls"
+			"--disable-libsanitizer"
 		)
 
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			myconf+=(
+				"--with-native-system-header-dir=${ROOT}/MacOSX.sdk/usr/include"
+				"--with-ld=${ROOT}/tmp/usr/bin/ldwrapper"
+			)
+		fi
+
 		export CFLAGS="-O1 -pipe"
 		export CXXFLAGS="-O1 -pipe"
 	fi
@@ -1320,6 +1291,33 @@ bootstrap_mpc() {
 	bootstrap_gnu mpc 1.2.1
 }
 
+bootstrap_ldwrapper() {
+	A=ldwrapper.c
+
+	einfo "Bootstrapping ${A%.c}"
+
+	efetch "https://rsync.prefix.bitzolder.nl/sys-devel/binutils-config/files/${A}" || return 1
+
+	export S="${PORTAGE_TMPDIR}/ldwrapper"
+	rm -rf "${S}"
+	mkdir -p "${S}" || return 1
+	cd "${S}" || return 1
+	cp "${DISTDIR}/${A}" . || return 1
+
+	einfo "Compiling ${A%.c}"
+	${CC:-gcc} \
+		-o ldwrapper \
+		-DCHOST="\"${CHOST}\"" \
+		-DEPREFIX="\"${ROOT}\"" \
+		ldwrapper.c || return 1
+
+	einfo "Installing ${A%.c}"
+	mkdir -p "${ROOT}"/tmp/usr/bin
+	cp -a ldwrapper "${ROOT}"/tmp/usr/bin/ || return 1
+
+	einfo "${A%.c} bootstrapped"
+}
+
 bootstrap_gcc5() {
 	# bootstraps with gcc-4.0.1 (Darwin 8), provides C11
 	bootstrap_gnu gcc 5.5.0
@@ -1482,12 +1480,51 @@ bootstrap_stage1() {
 		[[ -e ${ROOT}/tmp/${x} ]] || ( cd "${ROOT}"/tmp && ln -s usr/${x} )
 	done
 
-	# we could check compiler version here, but we just know
-	# it's Darwin 8 and 9 being affected here, so handle them to
-	# get a GCC-5 which is sufficient to compile the current tree
-	# packages
+	configure_toolchain
+	export CC CXX
+
+	# GCC 14 cannot be compiled by versions of Clang at least on
+	# Darwin17, so go the safe route and get GCC-5 which is sufficient
+	# and the last one we can compile without C11.  This also compiles
+	# on Darwin 8 and 9.
 	# see also configure_toolchain
-	if [[ ${CHOST} == *-darwin[89] ]] ; then
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# setup MacOSX.sdk symlink for GCC, this should probably be
+		# managed using an eselect module in the future
+		# FWIW, just use system (/) if it seems OK, for some reason
+		# early versions of TAPI-based SDKs did not include some symbols
+		# like fclose, which ld64 is able to resolve from the dylibs
+		# although they are unvisible using e.g. nm.
+		rm -f "${ROOT}"/MacOSX.sdk
+		local SDKPATH
+		if [[ -e /usr/lib/libSystem.B.dylib && -d /usr/include ]] ; then
+			SDKPATH=/
+		else
+			SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
+			if [[ -L ${SDKPATH} ]] ; then
+				local fsdk
+				local osvers
+				# try and find a matching OS SDK
+				fsdk="$(readlink -f "${SDKPATH}")"
+				osvers="$(sw_vers -productVersion)"
+				if [[ ${osvers%%.*} -le 10 ]] ; then
+					osvers=$(echo "${osvers}" | cut -d'.' -f1-2)
+				else
+					osvers=${osvers%%.*}
+				fi
+				fsdk=${fsdk%/MacOSX*.sdk}
+				fsdk=${fsdk}/MacOSX${osvers}.sdk
+				[[ -e ${fsdk} ]] && SDKPATH=${fsdk}
+			fi
+			if [[ ! -e ${SDKPATH} ]] ; then
+				SDKPATH=$(xcodebuild -showsdks | sort -nr \
+					| grep -o "macosx.*" | head -n1)
+				SDKPATH=$(xcode-select -print-path)/SDKs/MacOSX${SDKPATH#macosx}.sdk
+			fi
+		fi
+		( cd "${ROOT}" && ln -s "${SDKPATH}" MacOSX.sdk )
+		einfo "using system sources from ${SDKPATH}"
+
 		# benefit from 4.2 if it's present
 		if [[ -e /usr/bin/gcc-4.2 ]] ; then
 			export CC=gcc-4.2
@@ -1499,12 +1536,47 @@ bootstrap_stage1() {
 			|| (bootstrap_mpfr) || return 1
 		[[ -e ${ROOT}/tmp/usr/include/mpc.h ]] \
 			|| (bootstrap_mpc) || return 1
+		[[ -x ${ROOT}/tmp/usr/bin/ldwrapper ]] \
+			|| (bootstrap_ldwrapper) || return 1
+		# get ldwrapper target in PATH
+		export BINUTILS_CONFIG_LD="$(type -P ld)"
+		# force deployment target in GCCs build, GCC-5 doesn't quite get
+		# the newer macOS versions (20+) and thus confuses ld when it
+		# passes on the deployment version.  Use High Sierra as it has
+		# everything we need
+		[[ ${CHOST##*darwin} -gt 10 ]] && export MACOSX_DEPLOYMENT_TARGET=10.13
 		[[ -x ${ROOT}/tmp/usr/bin/gcc ]] \
 			|| (bootstrap_gcc5) || return 1
-	fi
 
-	configure_toolchain
-	export CC CXX
+		if [[ ${CHOST##*darwin} -gt 10 ]] ; then
+			# install wrappers in tmp/usr/local/bin which comes before
+			# /tmp/usr/bin in PATH
+			mkdir -p "${ROOT}"/tmp/usr/local/bin
+			rm -f "${ROOT}"/tmp/usr/local/bin/{gcc,${CHOST}-gcc}
+			cat > "${ROOT}/tmp/usr/local/bin/${CHOST}-gcc" <<-EOS
+				#!/usr/bin/env sh
+				export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
+				export BINUTILS_CONFIG_LD="$(type -P ld)"
+				exec "${ROOT}"/tmp/usr/bin/${CHOST}-gcc "\$@"
+			EOS
+			chmod 755 "${ROOT}/tmp/usr/local/bin/${CHOST}-gcc"
+			ln -s ${CHOST}-gcc "${ROOT}"/tmp/usr/local/bin/gcc
+
+			rm -f "${ROOT}"/tmp/usr/local/bin/{g++,${CHOST}-g++}
+			cat > "${ROOT}"/tmp/usr/local/bin/${CHOST}-g++ <<-EOS
+				#!/usr/bin/env sh
+				export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
+				export BINUTILS_CONFIG_LD="$(type -P ld)"
+				exec "${ROOT}"/tmp/usr/bin/${CHOST}-g++ "\$@"
+			EOS
+			chmod 755 "${ROOT}"/tmp/usr/local/bin/${CHOST}-g++
+			ln -s ${CHOST}-g++ "${ROOT}"/tmp/usr/local/bin/g++
+		fi
+
+		# reset after gcc-4.2 usage
+		export CC=gcc
+		export CXX=g++
+	fi
 
 	# Run all bootstrap_* commands in a subshell since the targets
 	# frequently pollute the environment using exports which affect
@@ -3018,7 +3090,7 @@ EOF
 		# location seems ok
 		break
 	done
-	export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$EPREFIX/tmp/usr/local/bin:${PATH}"
+	export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/local/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:${PATH}"
 
 	cat << EOF
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d718d0ee9fb3d3f7d958c0065d4c937cf98d6139
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 08:49:49 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 08:49:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d718d0ee

scripts/bootstrap-prefix: improve emake error reporting

If make fails, run with forced -j1 to get a clearer error for debugging
purposes.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 024a77392a..f49a595ad0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -44,7 +44,10 @@ emake() {
 		estatus "stage1: building ${PWD##*/}"
 	fi
 	read -r -a makeopts <<< "${MAKEOPTS}"
-	v "${MAKE}" "${makeopts[@]}" "$@" || return 1
+	if ! v "${MAKE}" "${makeopts[@]}" "$@" ; then
+		estatus "stage1: retry with -j1 for clearer error message in ${PWD##*/}"
+		v "${MAKE}" "${makeopts[@]}" "$@" -j1 || return 1
+	fi
 }
 
 efetch() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a114199475717d5bb2a2df40edec1b3ca6e0b299
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 07:42:25 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 07:42:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a1141994

scripts/bootstrap-prefix: be selective on where to use GCC-5 in stage1

GCC-5 doesn't compile on ARM64, newer versions of macOS might also prove
to be capable of compiling GCC-14.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 33c9feff34..07ce71168c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -391,10 +391,10 @@ bootstrap_profile() {
 			profile="prefix/darwin/macos/10.$((rev - 4))/x64"
 			;;
 		*64-apple-darwin2[0123456789])
-			# Big Sur is  11.0
-			# Monterey is 12.0
-			# Ventura is  13.0
-			# Sanoma is   14.0
+			# Big Sur is  11.0  darwin20
+			# Monterey is 12.0  darwin21
+			# Ventura is  13.0  darwin22
+			# Sanoma is   14.0  darwin23
 			rev=${CHOST##*darwin}
 			case ${CHOST%%-*} in
 				x86_64)  arch=x64    ;;
@@ -1483,11 +1483,9 @@ bootstrap_stage1() {
 	configure_toolchain
 	export CC CXX
 
-	# GCC 14 cannot be compiled by versions of Clang at least on
-	# Darwin17, so go the safe route and get GCC-5 which is sufficient
-	# and the last one we can compile without C11.  This also compiles
-	# on Darwin 8 and 9.
-	# see also configure_toolchain
+	# default: empty = NO
+	local USEGCC5=
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# setup MacOSX.sdk symlink for GCC, this should probably be
 		# managed using an eselect module in the future
@@ -1525,11 +1523,25 @@ bootstrap_stage1() {
 		( cd "${ROOT}" && ln -s "${SDKPATH}" MacOSX.sdk )
 		einfo "using system sources from ${SDKPATH}"
 
+		# GCC 14 cannot be compiled by versions of Clang at least on
+		# Darwin17, so go the safe route and get GCC-5 which is sufficient
+		# and the last one we can compile without C11.  This also compiles
+		# on Darwin 8 and 9.
+		# see also configure_toolchain
+		case ${CHOST} in
+			*-darwin[89])  USEGCC5=yes  ;;
+			*86*-darwin*)  USEGCC5=yes  ;;
+			# arm64/M1 isn't supported by old GCC-5!
+		esac
+	fi
+
+	if [[ -n ${USEGCC5} ]] ; then
 		# benefit from 4.2 if it's present
 		if [[ -e /usr/bin/gcc-4.2 ]] ; then
 			export CC=gcc-4.2
 			export CXX=g++-4.2
 		fi
+
 		[[ -e ${ROOT}/tmp/usr/include/gmp.h ]] \
 			|| (bootstrap_gmp) || return 1
 		[[ -e ${ROOT}/tmp/usr/include/mpfr.h ]] \

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0378ad858efe139d123cf92d769bfe95ce6b34fc
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 06:30:55 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 06:30:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0378ad85

scripts/bootstrap-prefix: emulate readlink -f behaviour for older macOS

Avoid some ugly warning and fallback to (likely) wrong SDK with failures
as result due to not expanding the MacOSX.sdk symlink properly.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 07ce71168c..9dfa1cda47 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -548,7 +548,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240718"
+	local PV="20240721"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
@@ -1503,7 +1503,14 @@ bootstrap_stage1() {
 				local fsdk
 				local osvers
 				# try and find a matching OS SDK
-				fsdk="$(readlink -f "${SDKPATH}")"
+				fsdk="$(readlink "${SDKPATH}")"
+				# note readlink -f is not supported on older versions of
+				# macOS so need to emulate it
+				if [[ ${fsdk} != /* ]] ; then
+					# this is not proper, but Apple does not use ../
+					# constructs here, as far as we know
+					fsdk="${SDKPATH%/*}/${fsdk}"
+				fi
 				osvers="$(sw_vers -productVersion)"
 				if [[ ${osvers%%.*} -le 10 ]] ; then
 					osvers=$(echo "${osvers}" | cut -d'.' -f1-2)

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     d72b6b0d55e3f33e18b0ffcb65a53afd5a704518
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 06:29:09 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 06:29:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d72b6b0d

scripts/bootstrap-prefix: make macOS Ventura and up skip GCC5

The host toolchain cannot compile GCC-5, but it *can* compile GCC-14,
which is exactly what we need, so skip GCC-5.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9dfa1cda47..11ad8eb8e4 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1536,6 +1536,7 @@ bootstrap_stage1() {
 		# on Darwin 8 and 9.
 		# see also configure_toolchain
 		case ${CHOST} in
+			*-darwin2[23456789]) :      ;;  # host toolchain can compile gcc-14
 			*-darwin[89])  USEGCC5=yes  ;;
 			*86*-darwin*)  USEGCC5=yes  ;;
 			# arm64/M1 isn't supported by old GCC-5!

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     4abb9bae4adcc38f480b435dfa01a88f676e0c03
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 06:24:15 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 06:24:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4abb9bae

scripts/bootstrap-prefix: disable USE=pie for Solaris bootstrap

Host compiler doesn't like -pie in the workload it has to do during
bootstrap, so go through lengths to disable it.
(Why can't we just override masks/forces from base?)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 11ad8eb8e4..eb89fa4847 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2032,6 +2032,13 @@ bootstrap_stage2() {
 	# unless we only build the buildtool, bug #603012
 	echo "dev-build/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
 
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# avoid complexities with the host toolchain
+		sed -i -e '/^sys-devel\/gcc pie$/d' \
+			"${PORTDIR}"/profiles/base/package.use.force
+		echo "sys-devel/gcc -pie" >> "${ROOT}"/tmp/etc/portage/package.use
+	fi
+
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
 	# Debian multiarch supported by RAP needs ld to support sysroot.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a39343a48782999fcf03a80cc7c7a90609faaa17
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 11:16:04 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 11:16:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a39343a4

scripts/bootstrap-prefix: use isainfo to pick up current arch

uname -p on Solaris will return historical values, so use isainfo to get
the currently targetted architecture

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index eb89fa4847..e434b1c61d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3409,10 +3409,16 @@ if [[ -z ${CHOST} ]]; then
 				fi
 				;;
 			SunOS)
-				case $(uname -p) in
+				case $(isainfo -n) in
+					amd64)
+						CHOST="x86_64-pc-solaris$(uname -r | sed 's|5|2|')"
+					;;
 					i386)
 						CHOST="i386-pc-solaris$(uname -r | sed 's|5|2|')"
 					;;
+					sparcv9)
+						CHOST="sparcv9-sun-solaris$(uname -r | sed 's|5|2|')"
+					;;
 					sparc)
 						CHOST="sparc-sun-solaris$(uname -r | sed 's|5|2|')"
 					;;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     03176f2d90ead5f2e3d0e3f9fe0498b2ff1e9f60
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 17:04:38 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 17:04:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=03176f2d

scripts/bootstrap-prefix: bump snapshot for Solaris fixes

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e434b1c61d..dfdff4c99e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -548,7 +548,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240721"
+	local PV="20240729"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     3f1be2af12937c77c962bb864a8254ffebedc15b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 16:18:52 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 16:18:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3f1be2af

scripts/bootstrap-prefix: set CPU_FLAGS_* when we can

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index dfdff4c99e..a20af50355 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -3289,6 +3289,47 @@ EOF
 
 	[[ ${STOP_BOOTSTRAP_AFTER} == stage3 ]] && exit 0
 
+	# do some sanity USE-flag enabling based on CPU, use cpuid2cpuflags
+	# if keyworded for this arg, else see if there's fallbacks to be
+	# made
+	mkdir -p "${EPREFIX}/etc/portage/package.use"
+	if emerge -1v cpuid2cpuflags ; then
+		hash -r
+		echo "*/* $(cpuid2cpuflags)" \
+			> "${EPREFIX}/etc/portage/package.use/00cpu-flags"
+	else
+		case "${CHOST}" in
+			arm64-*darwin*)
+				# https://github.com/RustCrypto/utils/issues/378
+				local flags=( "aes" "sha1" "sha2" )
+				local line
+				sysctl hw.optional | while read -r line ; do
+					line=${line#hw.optional.}
+					[[ ${line%%*: } == "1" ]] || continue
+					line=${line%: *}
+					case "${line}" in
+						"neon")
+							flags+=( "${line}" )
+							;;
+						"armv8_"*)
+							line=${line#armv8_}
+							case "${line}" in
+								"crc32")
+									flags+=( "${line}" )
+									;;
+								"2_sha"*)
+									flags+=( "${line#2_}" )
+									;;
+							esac
+							;;
+					esac
+				done
+				echo "*/* CPU_FLAGS_ARM: ${flags}" \
+					> "${EPREFIX}/etc/portage/package.use/00cpu-flags"
+				;;
+		esac
+	fi
+
 	local cmd="emerge -v --deep --update --changed-use @world"
 	if [[ -e ${EPREFIX}/var/cache/edb/mtimedb ]] && \
 		grep -q resume "${EPREFIX}"/var/cache/edb/mtimedb ;

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     63b269d10e7d752c4ca4f793d428da8b2fd4cd16
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 16:22:42 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 16:22:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=63b269d1

scripts/bootstrap-prefix: try and unify USE-flag disabling

As pointed out by hsk17, we have two places in which we disable
different sets of USE-flags, try to unify them.

In addition add http3, quic and curl_quic_openssl during bootstrap.

Bug: https://bugs.gentoo.org/936629
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a20af50355..1ee30e4b80 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1823,19 +1823,7 @@ do_emerge_pkgs() {
 		[[ -n ${pvdb} ]] && continue
 
 		local myuse=(
-			-acl
-			-berkdb
-			-fortran
-			-gdbm
-			-git
-			-libcxx
-			-http2
-			-nls
-			-pcre
-			-python
-			-qmanifest -qtegrity
-			-readline
-			-sanitize
+			"${DISABLE_USE[@]}"
 			bootstrap
 			clang
 			internal-glib
@@ -2472,7 +2460,7 @@ bootstrap_stage3() {
 
 	# Avoid installing git or encryption just for fun while completing @system
 	# e.g. bug #901101
-	export USE="-git -crypt -http2"
+	export USE="${DISABLE_USE[*]}"
 
 	# Portage should figure out itself what it needs to do, if anything.
 	local eflags=( "--deep" "--update" "--changed-use" "@system" )
@@ -2524,6 +2512,30 @@ set_helper_vars() {
 	SNAPSHOT_HOST=$(rapx http://distfiles.gentoo.org http://rsync.prefix.bitzolder.nl)
 	SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
 
+	# USE-flags to disable during bootstrap for they produce
+	# unnecessary, or worse: circular deps #901101, #936629
+	DISABLE_USE=(
+		"-acl"
+		"-berkdb"
+		"-crypt"
+		"-curl_quic_openssl"  # curl
+		"-fortran"            # gcc
+		"-gdbm"
+		"-git"
+		"-http2"              # curl
+		"-http3"              # curl
+		"-libcxx"
+		"-nls"
+		"-pcre"
+		"-python"
+		"-qmanifest"          # portage-utils
+		"-qtegrity"           # portage-utils
+		"-quic"               # curl
+		"-readline"           # bash
+		"-sanitize"
+	)
+
+
 	export MAKE CONFIG_SHELL
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     ae67723b0166b5de843e288b40d56016fffcf192
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 16:41:45 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 16:41:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ae67723b

scripts/bootstrap-prefix: workaround binutils being dep-cleaned

Thanks hsk17 for noticing and providing a patch.

Bug: https://bugs.gentoo.org/936629
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 1ee30e4b80..928a789603 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2468,6 +2468,11 @@ bootstrap_stage3() {
 	estatus "stage3: emerge ${eflags[*]}"
 	emerge --color n -v "${eflags[@]}" || return 1
 
+	# gcc no longer depends on sys-devel/binutils which means it is to
+	# be depcleaned at this point, quite strange, but to prevent this
+	# from happening, add to the worldfile #936629#c5
+	emerge --color n --noreplace sys-devel/binutils
+
 	# Remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"
 	estatus "stage3: emerge --depclean"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a075ebb0f6e2b47034e3d69fdf30a06e6f61af8a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 16:54:35 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 16:54:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a075ebb0

scripts/bootstrap-prefix: avoid USE=cet with binutils during bootstrap

the host compiler used may not support CET, causing binutils to fail, so
wait for that later when we got our own compiler

Thanks hsk17 for the analysis and proposed fix.

Bug: https://bugs.gentoo.org/936629
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 928a789603..e51c4783e5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2027,6 +2027,10 @@ bootstrap_stage2() {
 		echo "sys-devel/gcc -pie" >> "${ROOT}"/tmp/etc/portage/package.use
 	fi
 
+	# don't use CET, we don't know if the host compiler supports it
+	echo "sys-devel/binutils -cet" >> \
+		"${ROOT}"/tmp/etc/portage/profile/package.use.force
+
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
 	# Debian multiarch supported by RAP needs ld to support sysroot.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     b162980328869597b3ca817eee2dcabc268aace0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 18:52:30 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 18:52:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b1629803

scripts/bootstrap-prefix: ensure etc/portage/profile exists before writing

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index e51c4783e5..facb97eb75 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2020,10 +2020,11 @@ bootstrap_stage2() {
 	# unless we only build the buildtool, bug #603012
 	echo "dev-build/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
 
+	mkdir -p "${ROOT}"/tmp/etc/portage/profile  # site-specific overrides
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# avoid complexities with the host toolchain
-		sed -i -e '/^sys-devel\/gcc pie$/d' \
-			"${PORTDIR}"/profiles/base/package.use.force
+		echo "sys-devel/gcc -pie" >> \
+			"${ROOT}"/tmp/etc/portage/profile/package.use.force
 		echo "sys-devel/gcc -pie" >> "${ROOT}"/tmp/etc/portage/package.use
 	fi
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     085211fe4673f6b04893ea82c2d75b82ce37e39c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 18:53:28 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 18:53:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=085211fe

scripts/bootstrap-prefix: drop bits that assume we don't have a C++ compiler

The situation where we bootstrap with a non-C++ compiler is long gone.

Closes: https://bugs.gentoo.org/803551
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index facb97eb75..b4e8f75841 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -474,10 +474,6 @@ bootstrap_profile() {
 	# Disable bootstrapping libcxx* with libunwind
 	sys-libs/libcxxabi -libunwind
 	sys-libs/libcxx -libunwind
-	# Most binary Linux distributions seem to fancy toolchains that
-	# do not do c++ support (need to install a separate package).
-	sys-libs/ncurses -cxx
-	sys-devel/binutils -cxx
 	EOF
 
 	# On Darwin we might need this to bootstrap the compiler, since
@@ -487,19 +483,6 @@ bootstrap_profile() {
 	# For Darwin bootstraps
 	sys-devel/native-cctools
 	EOF
-
-	# Strange enough, -cxx causes wrong libtool config on Cygwin,
-	# but we require a C++ compiler there anyway - so just use it.
-	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
-	# gmp has cxx flag enabled by default. When dealing with a host
-	# compiler without cxx support this causes configure failure.
-	# In addition, The stage2 g++ is only for compiling stage3 compiler,
-	# because the host libstdc++.so runtime may be not compatible and
-	# stage2 libstdc++.so might conflict with that of stage3.  The
-	# trade-off is just not to use cxx.
-	dev-libs/gmp -cxx
-	sys-devel/binutils -gold
-	EOF
 }
 
 do_tree() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     e3ce0dbb0170eb5d3c3e88f7b5d4e304cd62bb48
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 18:54:36 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 18:54:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e3ce0dbb

scripts/bootstrap-prefix: first complete @system before using USE-flags

Complete @system before trying to set default USE-flags.
This may cause re-compilations but is necessary to avoid circular deps
e.g. with curl, so take the extra step, much like how in the past we
would emerge -e @world after @system.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b4e8f75841..d12440fd8c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2451,7 +2451,7 @@ bootstrap_stage3() {
 	export USE="${DISABLE_USE[*]}"
 
 	# Portage should figure out itself what it needs to do, if anything.
-	local eflags=( "--deep" "--update" "--changed-use" "@system" )
+	local eflags=( "@system" )
 	einfo "running emerge ${eflags[*]}"
 	estatus "stage3: emerge ${eflags[*]}"
 	emerge --color n -v "${eflags[@]}" || return 1
@@ -2461,6 +2461,16 @@ bootstrap_stage3() {
 	# from happening, add to the worldfile #936629#c5
 	emerge --color n --noreplace sys-devel/binutils
 
+	# now try and get things in the way they should be according to the
+	# default USE-flags
+	unset USE
+
+	# Portage should figure out itself what it needs to do, if anything.
+	eflags=( "--deep" "--update" "--changed-use" "@world" )
+	einfo "running emerge ${eflags[*]}"
+	estatus "stage3: emerge ${eflags[*]}"
+	emerge --color n -v "${eflags[@]}" || return 1
+
 	# Remove anything that we don't need (compilers most likely)
 	einfo "running emerge --depclean"
 	estatus "stage3: emerge --depclean"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     1c92fe1fe4f13bdba02f904622e1a2541586f175
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 06:33:42 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 06:33:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1c92fe1f

scripts/bootstrap-prefix: try and fix cyclic deps for nghttp2

bring back the old code which used a minimal set of USE-flags to mask
which is necessary to break cycles such as one involving nghttp2 and
curl.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 148 ++++++++++++++++++--------------------------
 1 file changed, 59 insertions(+), 89 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d12440fd8c..98c2282e05 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2447,11 +2447,14 @@ bootstrap_stage3() {
 	fi
 
 	# Avoid installing git or encryption just for fun while completing @system
-	# e.g. bug #901101
-	export USE="${DISABLE_USE[*]}"
+	# e.g. bug #901101, this is a reduced (e.g. as minimal as possible)
+	# set of DISABLE_USE, to set the stage for solving circular
+	# dependencies, such as:
+	# - nghttp2 -> cmake -> curl -> nghttp2
+	export USE="-git -crypt -http2"
 
 	# Portage should figure out itself what it needs to do, if anything.
-	local eflags=( "@system" )
+	local eflags=( "--deep" "--update" "--changed-use" "@system" )
 	einfo "running emerge ${eflags[*]}"
 	estatus "stage3: emerge ${eflags[*]}"
 	emerge --color n -v "${eflags[@]}" || return 1
@@ -2461,12 +2464,57 @@ bootstrap_stage3() {
 	# from happening, add to the worldfile #936629#c5
 	emerge --color n --noreplace sys-devel/binutils
 
+	# Remove the stage2 hack from above.  A future emerge run will
+	# get env-update to happen.
+	rm "${ROOT}"/etc/env.d/98stage2
+
 	# now try and get things in the way they should be according to the
 	# default USE-flags
 	unset USE
 
-	# Portage should figure out itself what it needs to do, if anything.
-	eflags=( "--deep" "--update" "--changed-use" "@world" )
+	# do some sanity USE-flag enabling based on CPU, use cpuid2cpuflags
+	# if keyworded for this arg, else see if there's fallbacks to be
+	# made
+	mkdir -p "${ROOT}/etc/portage/package.use"
+	if emerge --color n --oneshot -v cpuid2cpuflags ; then
+		hash -r
+		echo "*/* $(cpuid2cpuflags)" \
+			> "${ROOT}/etc/portage/package.use/00cpu-flags"
+	else
+		case "${CHOST}" in
+			arm64-*darwin*)
+				# https://github.com/RustCrypto/utils/issues/378
+				local flags=( "aes" "sha1" "sha2" )
+				local line
+				sysctl hw.optional | while read -r line ; do
+					line=${line#hw.optional.}
+					[[ ${line%%*: } == "1" ]] || continue
+					line=${line%: *}
+					case "${line}" in
+						"neon")
+							flags+=( "${line}" )
+							;;
+						"armv8_"*)
+							line=${line#armv8_}
+							case "${line}" in
+								"crc32")
+									flags+=( "${line}" )
+									;;
+								"2_sha"*)
+									flags+=( "${line#2_}" )
+									;;
+							esac
+							;;
+					esac
+				done
+				echo "*/* CPU_FLAGS_ARM: ${flags}" \
+					> "${ROOT}/etc/portage/package.use/00cpu-flags"
+				;;
+		esac
+	fi
+
+	# re-emerge anything hopefully not running into circular deps
+	eflags=( "--deep" "--changed-use" "@world" )
 	einfo "running emerge ${eflags[*]}"
 	estatus "stage3: emerge ${eflags[*]}"
 	emerge --color n -v "${eflags[@]}" || return 1
@@ -2480,10 +2528,6 @@ bootstrap_stage3() {
 	# (--depclean may fail, which is ok)
 	sed -i -e 's/resume/cleared/' "${ROOT}"/var/cache/edb/mtimedb
 
-	# Remove the stage2 hack from above.  A future emerge run will
-	# get env-update to happen.
-	rm "${ROOT}"/etc/env.d/98stage2
-
 	estatus "stage3 finished"
 	einfo "stage3 successfully finished"
 }
@@ -3145,7 +3189,7 @@ OK!  I'm going to give it a try, this is what I have collected sofar:
 I'm now going to make an awful lot of noise going through a sequence of
 stages to make your box as groovy as I am myself, setting up your
 Prefix.  In short, I'm going to run stage1, stage2, stage3, followed by
-an emerge to do a final update to your system.  If any of these stages
+installing a package to enter your Prefix.  If any of these stages
 fail, both you and me are in deep trouble.  So let's hope that doesn't
 happen.
 EOF
@@ -3304,87 +3348,13 @@ EOF
 
 	[[ ${STOP_BOOTSTRAP_AFTER} == stage3 ]] && exit 0
 
-	# do some sanity USE-flag enabling based on CPU, use cpuid2cpuflags
-	# if keyworded for this arg, else see if there's fallbacks to be
-	# made
-	mkdir -p "${EPREFIX}/etc/portage/package.use"
-	if emerge -1v cpuid2cpuflags ; then
-		hash -r
-		echo "*/* $(cpuid2cpuflags)" \
-			> "${EPREFIX}/etc/portage/package.use/00cpu-flags"
-	else
-		case "${CHOST}" in
-			arm64-*darwin*)
-				# https://github.com/RustCrypto/utils/issues/378
-				local flags=( "aes" "sha1" "sha2" )
-				local line
-				sysctl hw.optional | while read -r line ; do
-					line=${line#hw.optional.}
-					[[ ${line%%*: } == "1" ]] || continue
-					line=${line%: *}
-					case "${line}" in
-						"neon")
-							flags+=( "${line}" )
-							;;
-						"armv8_"*)
-							line=${line#armv8_}
-							case "${line}" in
-								"crc32")
-									flags+=( "${line}" )
-									;;
-								"2_sha"*)
-									flags+=( "${line#2_}" )
-									;;
-							esac
-							;;
-					esac
-				done
-				echo "*/* CPU_FLAGS_ARM: ${flags}" \
-					> "${EPREFIX}/etc/portage/package.use/00cpu-flags"
-				;;
-		esac
+	# Now, we've got everything in $ROOT, we can get rid of /tmp
+	if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then
+		rm -Rf "${EPREFIX}"/tmp || return 1
+		mkdir -p "${EPREFIX}"/tmp || return 1
 	fi
 
-	local cmd="emerge -v --deep --update --changed-use @world"
-	if [[ -e ${EPREFIX}/var/cache/edb/mtimedb ]] && \
-		grep -q resume "${EPREFIX}"/var/cache/edb/mtimedb ;
-	then
-		cmd="emerge -v --resume"
-	fi
-	einfo "running ${cmd}"
-	if ${cmd} ; then
-		# Now, we've got everything in $ROOT, we can get rid of /tmp
-		if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then
-			rm -Rf "${EPREFIX}"/tmp || return 1
-			mkdir -p "${EPREFIX}"/tmp || return 1
-		fi
-
-		hash -r  # tmp/* stuff is removed in stage3
-	else
-		# emerge @world fail
-		cat << EOF
-
-Oh yeah, I thought I was almost there, and then this!  I did
-  ${cmd}
-and it failed at some point :(  Details might be found in the build log:
-EOF
-		for log in "${EPREFIX}"/var/tmp/portage/*/*/temp/build.log ; do
-			[[ -e ${log} ]] || continue
-			echo "  ${log}"
-		done
-		[[ -e ${log} ]] || echo "  (no build logs found?!?)"
-		cat << EOF
-I have no clue, really.  Please find friendly folks in #gentoo-prefix on
-irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, or file a bug
-at bugs.gentoo.org under Gentoo/Alt, Prefix Support.
-You know, I got the feeling you just started to like me, but I guess
-that's all gone now.  I'll bother you no longer.
-
-  CHOST:     ${CHOST}
-  IDENT:     ${CHOST_IDENTIFY}
-EOF
-		exit 1
-	fi
+	hash -r  # tmp/* stuff is removed in stage3
 
 	if ! bash "${BASH_SOURCE[0]}" "${EPREFIX}" startscript ; then
 		# startscript fail?

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     715db699226245f555867d8f3774f1f9343f2c8a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 13:27:55 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 13:27:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=715db699

scripts/bootstrap-prefix: use DISABLE_USE for circular deps

Use set of USE-flags that are necessary to break circular deps, and
reduce more to just weed unnecessary dependencies.  Use DISABLE_USE for
the circular ones so they can be properly reused.

Bug: https://bugs.gentoo.org/936629
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 98c2282e05..888023efc5 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1805,11 +1805,26 @@ do_emerge_pkgs() {
 		done
 		[[ -n ${pvdb} ]] && continue
 
+		# avoid many deps at this stage which aren't necessary, e.g.
+		# having a bash without readline is OK, we're not using the
+		# shell interactive
 		local myuse=(
 			"${DISABLE_USE[@]}"
-			bootstrap
-			clang
-			internal-glib
+			"-acl"
+			"-berkdb"
+			"-fortran"            # gcc
+			"-gdbm"
+			"-libcxx"
+			"-nls"
+			"-pcre"
+			"-python"
+			"-qmanifest"          # portage-utils
+			"-qtegrity"           # portage-utils
+			"-readline"           # bash
+			"-sanitize"
+			"bootstrap"
+			"clang"
+			"internal-glib"
 		)
 		local override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#"${ROOT}"}"
 
@@ -2450,8 +2465,7 @@ bootstrap_stage3() {
 	# e.g. bug #901101, this is a reduced (e.g. as minimal as possible)
 	# set of DISABLE_USE, to set the stage for solving circular
 	# dependencies, such as:
-	# - nghttp2 -> cmake -> curl -> nghttp2
-	export USE="-git -crypt -http2"
+	export USE="${DISABLE_USE[*]}"
 
 	# Portage should figure out itself what it needs to do, if anything.
 	local eflags=( "--deep" "--update" "--changed-use" "@system" )
@@ -2561,28 +2575,16 @@ set_helper_vars() {
 
 	# USE-flags to disable during bootstrap for they produce
 	# unnecessary, or worse: circular deps #901101, #936629
+	# - nghttp2 -> cmake -> curl -> nghttp2  (http2)
 	DISABLE_USE=(
-		"-acl"
-		"-berkdb"
 		"-crypt"
 		"-curl_quic_openssl"  # curl
-		"-fortran"            # gcc
-		"-gdbm"
 		"-git"
 		"-http2"              # curl
 		"-http3"              # curl
-		"-libcxx"
-		"-nls"
-		"-pcre"
-		"-python"
-		"-qmanifest"          # portage-utils
-		"-qtegrity"           # portage-utils
 		"-quic"               # curl
-		"-readline"           # bash
-		"-sanitize"
 	)
 
-
 	export MAKE CONFIG_SHELL
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     caac940fe3594a7f48900de9a2aca0dbf21bc798
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 11:46:25 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 11:46:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=caac940f

scripts/bootstrap-prefix: remove automatic CPU_FLAGS_* setting

It doesn't do much, and turns the Prefix from generic to specific to the
running machine, which is an undesirable side-effect.

Closes: https://bugs.gentoo.org/939038
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 888023efc5..5ad9f4dc7a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2486,47 +2486,6 @@ bootstrap_stage3() {
 	# default USE-flags
 	unset USE
 
-	# do some sanity USE-flag enabling based on CPU, use cpuid2cpuflags
-	# if keyworded for this arg, else see if there's fallbacks to be
-	# made
-	mkdir -p "${ROOT}/etc/portage/package.use"
-	if emerge --color n --oneshot -v cpuid2cpuflags ; then
-		hash -r
-		echo "*/* $(cpuid2cpuflags)" \
-			> "${ROOT}/etc/portage/package.use/00cpu-flags"
-	else
-		case "${CHOST}" in
-			arm64-*darwin*)
-				# https://github.com/RustCrypto/utils/issues/378
-				local flags=( "aes" "sha1" "sha2" )
-				local line
-				sysctl hw.optional | while read -r line ; do
-					line=${line#hw.optional.}
-					[[ ${line%%*: } == "1" ]] || continue
-					line=${line%: *}
-					case "${line}" in
-						"neon")
-							flags+=( "${line}" )
-							;;
-						"armv8_"*)
-							line=${line#armv8_}
-							case "${line}" in
-								"crc32")
-									flags+=( "${line}" )
-									;;
-								"2_sha"*)
-									flags+=( "${line#2_}" )
-									;;
-							esac
-							;;
-					esac
-				done
-				echo "*/* CPU_FLAGS_ARM: ${flags}" \
-					> "${ROOT}/etc/portage/package.use/00cpu-flags"
-				;;
-		esac
-	fi
-
 	# re-emerge anything hopefully not running into circular deps
 	eflags=( "--deep" "--changed-use" "@world" )
 	einfo "running emerge ${eflags[*]}"

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7bac23df5207994ccf1bbdb7227fbdd713163224
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 19:50:53 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 19:50:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7bac23df

scripts/bootstrap-prefix: use libffi-3.4.5 for Darwin24

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5ad9f4dc7a..a4e3673dd7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1257,6 +1257,7 @@ bootstrap_zlib() {
 
 bootstrap_libffi() {
 	# 3.0.8: last version to bootstrap on Darwin 9 x86
+	bootstrap_gnu libffi 3.4.5 || \
 	bootstrap_gnu libffi 3.3 || \
 	bootstrap_gnu libffi 3.2.1 || \
 	bootstrap_gnu libffi 3.0.8

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     eadd02fd66d8cea0869bba0ad3c0bb4b12360861
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 17:02:04 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 17:02:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=eadd02fd

scripts/bootstrap-prefix: bump snapshot date

This brings in a profile for Darwin24 (Sequoia) but not a working
bootstrap for that platform yet.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index a4e3673dd7..903f199ce9 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -531,7 +531,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240729"
+	local PV="20240922"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     7e89bde9528aff4c686b6d70e0f38da3f31e0409
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 12:50:05 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 12:50:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7e89bde9

scripts/bootstrap-prefix: drop obsolete darwin rpath workaround

This has been fixed for some time, and for sure in GCC-14 versions we
use.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 903f199ce9..73e6d10bd8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2039,28 +2039,6 @@ bootstrap_stage2() {
 		emerge_pkgs --nodeps "${pkg}" || return 1
 	done
 
-	# During Gentoo prefix bootstrap stage2, GCC is built with
-	# "--disable-bootstrap". For Darwin, it means that rather than letting
-	# GCC to eventually build itself using multiple passes, we're forcing
-	# it to build with the host LLVM/clang toolchain in a single pass.
-	# It's not officially supported, but practically it worked. However,
-	# since >=gcc-12.2.0, in order to support the new embedded rpath
-	# feature on Darwin, two incompatible options, "-nodefaultrpaths" and
-	# "-nodefaultexport" are introduced. This causes linking failures,
-	# since these options are only recognized by GCC and are unknown to
-	# LLVM/clang (hypothetically, using an older GCC possibly causes the
-	# same problem as well).
-	#
-	# Thus, embedded rpath should be disabled during prefix bootstrap stage2
-	# and passed into EXTRA_ECONF.
-	# https://bugs.gentoo.org/895334
-	if [[ ${CHOST} == *-darwin* ]] ;
-	then
-		local disable_darwin_rpath="--disable-darwin-at-rpath"
-	else
-		local disable_darwin_rpath=""
-	fi
-
 	for pkg in ${compiler_stage1} ; do
 		# <glibc-2.5 does not understand .gnu.hash, use
 		# --hash-style=both to produce also sysv hash.

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     2f9568f025368d6c9a794918536bac653867f0ba
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 13:03:56 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 13:03:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2f9568f0

scripts/bootstrap-prefix: try harder to find matching SDK to OS

When xcrun returns the latest SDK, no symlink is present, so don't use
that to decide whether or not to find a matching SDK on macOS.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 73e6d10bd8..fe1b07bf25 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1483,11 +1483,13 @@ bootstrap_stage1() {
 			SDKPATH=/
 		else
 			SDKPATH=$(xcrun --show-sdk-path --sdk macosx)
-			if [[ -L ${SDKPATH} ]] ; then
+			if [[ -e ${SDKPATH} ]] ; then
 				local fsdk
 				local osvers
-				# try and find a matching OS SDK
-				fsdk="$(readlink "${SDKPATH}")"
+				# try and find a matching OS SDK, xcrun seems to return
+				# the latest installed, so not necessarily the one
+				# matching the macOS version
+				[[ -L ${SDKPATH} ]] && fsdk="$(readlink "${SDKPATH}")"
 				# note readlink -f is not supported on older versions of
 				# macOS so need to emulate it
 				if [[ ${fsdk} != /* ]] ; then

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     a5f19d47a1d7e83f2a2594c7396e639cb7d9c325
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 07:18:36 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 07:18:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a5f19d47

scripts/bootstrap-prefix: switch compiler to a properly bootstrapped one

We need include-fixed headers and the machinery around it, besides that
it is highly discouraged to skip bootstrapping on "foreign" envs as the
one we're in at stage2.
Rename USE=bootstrap to USE=system-bootstrap
Update coreutils bootstrap to 9.5

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fe1b07bf25..9a21185e04 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1337,6 +1337,7 @@ bootstrap_coreutils() {
 	# 8.16 is the last version released as tar.gz
 	# 8.18 is necessary for macOS High Sierra (darwin17) and converted
 	#      to tar.gz for this case
+	bootstrap_gnu coreutils 9.5 || \
 	bootstrap_gnu coreutils 8.32 || bootstrap_gnu coreutils 8.30 || \
 	bootstrap_gnu coreutils 8.16 || bootstrap_gnu coreutils 8.17
 }
@@ -1825,7 +1826,7 @@ do_emerge_pkgs() {
 			"-qtegrity"           # portage-utils
 			"-readline"           # bash
 			"-sanitize"
-			"bootstrap"
+			"system-bootstrap"
 			"clang"
 			"internal-glib"
 		)
@@ -2041,19 +2042,33 @@ bootstrap_stage2() {
 		emerge_pkgs --nodeps "${pkg}" || return 1
 	done
 
+	# GCC doesn't respect CPPFLAGS because of its own meddling as well
+	# as toolchain.eclass, so provide a wrapper here to force just
+	# installed packages to be found
+	mkdir -p "${ROOT}"/tmp/usr/local/bin
+	rm -f "${ROOT}"/tmp/usr/local/bin/my{gcc,g++}
+	cat > "${ROOT}/tmp/usr/local/bin/mygcc" <<-EOS
+		#!/usr/bin/env sh
+		exec ${CC} "\$@" ${CPPFLAGS}
+	EOS
+	cat > "${ROOT}/tmp/usr/local/bin/myg++" <<-EOS
+		#!/usr/bin/env sh
+		exec ${CXX} "\$@" ${CPPFLAGS}
+	EOS
+	chmod 755 "${ROOT}/tmp/usr/local/bin/my"{gcc,g++}
+
 	for pkg in ${compiler_stage1} ; do
 		# <glibc-2.5 does not understand .gnu.hash, use
 		# --hash-style=both to produce also sysv hash.
 		# GCC apparently drops CPPFLAGS at some point, which makes it
 		# not find things like gmp which we just installed, so force it
 		# to find our prefix
-		# For >=gcc-12.2.0, rpath needs to be disabled in stage2 on
-		# Darwin, see above.
-		EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both) --with-local-prefix=${ROOT} ${disable_darwin_rpath}" \
+		EXTRA_ECONF="$(rapx --with-linker-hash-style=both) --with-local-prefix=${ROOT}" \
 		MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 		GCC_MAKE_TARGET=all \
+		OVERRIDE_CFLAGS="${CPPFLAGS} ${OVERRIDE_CFLAGS}" \
 		OVERRIDE_CXXFLAGS="${CPPFLAGS} ${OVERRIDE_CXXFLAGS}" \
-		TPREFIX="${ROOT}" \
+		CC=mygcc CXX=myg++ \
 		PYTHON_COMPAT_OVERRIDE=python$(python_ver) \
 		emerge_pkgs --nodeps "${pkg}" || return 1
 
@@ -2134,7 +2149,7 @@ bootstrap_stage3() {
 	# At this point, we should have a proper GCC, and don't need to
 	# rely on the system wrappers.  Let's get rid of them, so that
 	# they stop mucking up builds.
-	rm -f "${ROOT}"/tmp/usr/local/bin/*
+	rm -f "${ROOT}"/tmp/usr/local/bin/{,my,${CHOST}-}{gcc,g++}
 
 	configure_toolchain || return 1
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     f6632ea6ca8f1b28c54d7a6a852259bcb13c3e11
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 13:29:38 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 13:29:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6632ea6

scripts/bootstrap-prefix: bump snapshot (for macOS Sequoia)

- add timeout to wget (because defaults are unbearable, and gnu is down
  for the moment)
- update snapshot including gcc-14.2.0 fix for macOS
- add sed-4.9 to the list of seds to try

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 9a21185e04..ac38ff7b9f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -72,7 +72,7 @@ efetch() {
 			# Try to find a download manager, we only deal with wget,
 			# curl, FreeBSD's fetch and ftp.
 			if [[ $(type -t wget) == "file" ]] ; then
-				FETCH_COMMAND="wget"
+				FETCH_COMMAND="wget -t 3 -T 3"  # 3x3s wait
 				[[ $(wget -h) == *"--no-check-certificate"* ]] \
 					&& FETCH_COMMAND+=" --no-check-certificate"
 			elif [[ $(type -t curl) == "file" ]] ; then
@@ -531,7 +531,7 @@ bootstrap_tree() {
 	#                      retain this comment and the line below to
 	#                      keep this snapshot around in the snapshots
 	# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
-	local PV="20240922"
+	local PV="20240930"
 
 	# RAP uses the latest gentoo main repo snapshot to bootstrap.
 	is-rap && LATEST_TREE_YES=1
@@ -1308,7 +1308,7 @@ bootstrap_gcc5() {
 }
 
 bootstrap_sed() {
-	bootstrap_gnu sed 4.5 || \
+	bootstrap_gnu sed 4.9 || bootstrap_gnu sed 4.5 || \
 	bootstrap_gnu sed 4.2.2 || bootstrap_gnu sed 4.2.1
 }
 

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     33c6d9a6c120da352cf7fbccca1063483fa66878
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 12:52:04 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 12:52:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=33c6d9a6

scripts/bootstrap-prefix: use newer cmake too bootstrap

Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ac38ff7b9f..fdbe73e17e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1176,18 +1176,19 @@ bootstrap_cmake_core() {
 
 	# we need sysroot crap to build cmake itself, but it makes trouble
 	# later on, so kill it in the installed version
-	ver=${A%-*} ; ver=${ver%.*}
 	sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-		"${ROOT}/tmp/usr/share/${ver}/Modules/Platform"/Apple-GNU-*.cmake || die
+		"${ROOT}"/tmp/usr/share/cmake*/Modules/Platform/Apple-GNU-*.cmake || die
 	# disable isysroot usage with clang as well
 	sed -i -e '/_SYSROOT_FLAG/d' \
-		"${ROOT}/tmp/usr/share/${ver}/Modules/Platform"/Apple-Clang.cmake || die
+		"${ROOT}"/tmp/usr/share/cmake*/Modules/Platform/Apple-Clang.cmake || die
 
 	einfo "${A%.tar.*} bootstrapped"
 }
 
 bootstrap_cmake() {
-	bootstrap_cmake_core 3.16.5 || bootstrap_cmake_core 3.0.2
+	bootstrap_cmake_core 3.20.6 || \
+	bootstrap_cmake_core 3.16.5 || \
+	bootstrap_cmake_core 3.0.2
 }
 
 bootstrap_zlib_core() {

[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0e8cc099b8d696b2354e8705ce83bcf317ed9a7a
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri Oct 18 14:00:50 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 14:00:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0e8cc099

scripts/bootstrap-prefix: add support for Darwin Clang bootstrap path

This is a slightly modified version of
https://github.com/gentoo/prefix/pull/34/commits/6319cbe1d15c3831bd4a2e5b52c4367abc68747d

Bug: https://bugs.gentoo.org/758167
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 152 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 127 insertions(+), 25 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fdbe73e17e..86b7860595 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -220,18 +220,17 @@ configure_toolchain() {
 					# this is Clang, recent enough to compile recent clang
 					compiler_stage1+="
 						${llvm_deps}
-						sys-libs/libcxxabi
-						sys-libs/libcxx
+						sys-libs/compiler-rt
 						sys-devel/llvm
+						sys-devel/lld
+						sys-devel/clang-common
 						sys-devel/clang
 					"
 					CC=clang
 					CXX=clang++
-					# avoid going through hoops and deps for
-					# binutils-apple, rely on the host-installed ld to
-					# build a compiler, we'll pull in binutils-apple
-					# from system set
-					linker=sys-devel/native-cctools
+					linker=
+					[[ "${BOOTSTRAP_STAGE}" == stage2 ]] && \
+						linker=sys-devel/lld
 					;;
 				*)
 					eerror "unknown/unsupported compiler"
@@ -240,12 +239,16 @@ configure_toolchain() {
 			esac
 
 			compiler="
-				dev-libs/libffi
 				${llvm_deps}
+				sys-libs/compiler-rt
 				sys-libs/libcxxabi
 				sys-libs/libcxx
 				sys-devel/llvm
-				sys-devel/clang"
+				sys-devel/lld
+				sys-libs/llvm-libunwind
+				sys-devel/clang-common
+				sys-devel/clang
+			"
 			;;
 		*-linux*)
 			is-rap && einfo "Triggering Linux RAP bootstrap"
@@ -457,6 +460,8 @@ bootstrap_profile() {
 	if [[ ${DARWIN_USE_GCC} == 1 ]] ; then
 		# amend profile, to use gcc one
 		profile="${profile}/gcc"
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		[[ "${BOOTSTRAP_STAGE}" != stage2 ]] && profile+="/clang"
 	fi
 
 	[[ -n ${PROFILE_BASE}${PROFILE_VARIANT} ]] &&
@@ -1466,7 +1471,7 @@ bootstrap_stage1() {
 		[[ -e ${ROOT}/tmp/${x} ]] || ( cd "${ROOT}"/tmp && ln -s usr/${x} )
 	done
 
-	configure_toolchain
+	BOOTSTRAP_STAGE="stage1" configure_toolchain || return 1
 	export CC CXX
 
 	# default: empty = NO
@@ -1752,9 +1757,16 @@ bootstrap_stage1() {
 	# setup a profile for stage2
 	mkdir -p "${ROOT}"/tmp/etc/. || return 1
 	[[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || \
-		(	"${CP}" -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc && \
+		(
+			"${CP}" -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc && \
 			rm -f "${ROOT}"/tmp/etc/portage/make.profile && \
-			(ROOT="${ROOT}"/tmp PREFIX_DISABLE_RAP=yes bootstrap_profile) ) || return 1
+			(
+				ROOT="${ROOT}"/tmp \
+				PREFIX_DISABLE_RAP="yes" \
+				BOOTSTRAP_STAGE="stage2" \
+				bootstrap_profile
+			)
+		) || return 1
 
 	# setup portage
 	[[ -e ${ROOT}/tmp/usr/bin/emerge ]] || (bootstrap_portage) || return 1
@@ -1819,7 +1831,6 @@ do_emerge_pkgs() {
 			"-berkdb"
 			"-fortran"            # gcc
 			"-gdbm"
-			"-libcxx"
 			"-nls"
 			"-pcre"
 			"-python"
@@ -1831,7 +1842,24 @@ do_emerge_pkgs() {
 			"clang"
 			"internal-glib"
 		)
-		local override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#"${ROOT}"}"
+
+		local skip_llvm_pkg_setup=
+		if [[ ${CHOST}:${DARWIN_USE_GCC} == *-darwin*:0 ]] ; then
+			# Clang-based Darwin
+			myuse+=(
+				"-binutils-plugin"
+				"default-compiler-rt"
+				"default-libcxx"
+				"default-lld"
+			)
+			if [[ "${BOOTSTRAP_STAGE}" == stage2 ]] ; then
+				myuse+=( "bootstrap-prefix" )
+				skip_llvm_pkg_setup="yes"
+			fi
+		fi
+
+		local override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}"
+		override_make_conf_dir+="${MAKE_CONF_DIR#"${ROOT}"}"
 
 		if [[ " ${USE} " == *" prefix-stack "* ]] &&
 		   [[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] &&
@@ -1892,6 +1920,7 @@ do_emerge_pkgs() {
 			PORTAGE_SYNC_STALE=0 \
 			FEATURES="-news ${FEATURES}" \
 			USE="${myuse[*]}" \
+			LLVM_ECLASS_SKIP_PKG_SETUP="${skip_llvm_pkg_setup}" \
 			"${ROOT}"/tmp/bin/python \
 			"${ROOT}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}"
 		) || return 1
@@ -1908,7 +1937,7 @@ bootstrap_stage2() {
 
 	# Find out what toolchain packages we need, and configure LDFLAGS
 	# and friends.
-	configure_toolchain || return 1
+	BOOTSTRAP_STAGE="stage2" configure_toolchain || return 1
 	configure_cflags || return 1
 	export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
 	export CC CXX
@@ -1995,6 +2024,24 @@ bootstrap_stage2() {
 		EOF
 	fi
 
+	# provide active SDK link on Darwin
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		rm -f "${ROOT}"/tmp/MacOSX.sdk
+		( cd "${ROOT}"/tmp && ln -s ../MacOSX.sdk MacOSX.sdk )
+		if [[ ${DARWIN_USE_GCC} == 0 ]] ; then
+			# Until proper clang is installed, just redirect calls to it
+			# to the system's one. Libtool is here because its path is
+			# passed to the compiler-rt and llvm's ebuilds.
+			for bin in libtool clang clang++ ; do
+				{
+					echo "#!${ROOT}/tmp/bin/sh"
+					echo "exec ${bin}"' "$@"'
+				} > "${ROOT}/tmp/usr/bin/${CHOST}-${bin}"
+				chmod +x "${ROOT}/tmp/usr/bin/${CHOST}-${bin}"
+			done
+		fi
+	fi
+
 	# Build a basic compiler and portage dependencies in $ROOT/tmp.
 	pkgs=(
 		sys-devel/gnuconfig
@@ -2013,12 +2060,6 @@ bootstrap_stage2() {
 		sys-devel/binutils-config
 	)
 
-	# provide active SDK link on Darwin
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		rm -f "${ROOT}"/tmp/MacOSX.sdk
-		( cd "${ROOT}"/tmp && ln -s ../MacOSX.sdk MacOSX.sdk )
-	fi
-
 	# cmake has some external dependencies which require autoconf, etc.
 	# unless we only build the buildtool, bug #603012
 	echo "dev-build/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
@@ -2037,8 +2078,8 @@ bootstrap_stage2() {
 
 	emerge_pkgs --nodeps "${pkgs[@]}" || return 1
 
-	# Debian multiarch supported by RAP needs ld to support sysroot.
 	for pkg in ${linker} ; do
+		# Debian multiarch supported by RAP needs ld to support sysroot.
 		EXTRA_ECONF=$(rapx --with-sysroot=/) \
 		emerge_pkgs --nodeps "${pkg}" || return 1
 	done
@@ -2083,12 +2124,22 @@ bootstrap_stage2() {
 	done
 
 	if [[ ${compiler_type} == clang ]] ; then
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			# Stop using host's compilers, but still need 'libtool' in PATH.
+			rm "${ROOT}/tmp/usr/bin/${CHOST}"-{libtool,clang,clang++}
+			mkdir -p "${ROOT}"/usr/bin
+			ln -s "${ROOT}"/tmp/usr/lib/llvm/*/bin/llvm-libtool-darwin \
+				"${ROOT}"/usr/bin/libtool
+		fi
+
 		# We use Clang as our toolchain compiler, so we need to make
 		# sure we actually use it
 		mkdir -p -- "${MAKE_CONF_DIR}"
 		{
 			echo
 			echo "# System compiler on $(uname) Prefix is Clang, do not remove this"
+			echo "AS=\"${CHOST}-clang -c\""
+			echo "CPP=${CHOST}-clang-cpp"
 			echo "CC=${CHOST}-clang"
 			echo "CXX=${CHOST}-clang++"
 			echo "OBJC=${CHOST}-clang"
@@ -2152,7 +2203,7 @@ bootstrap_stage3() {
 	# they stop mucking up builds.
 	rm -f "${ROOT}"/tmp/usr/local/bin/{,my,${CHOST}-}{gcc,g++}
 
-	configure_toolchain || return 1
+	BOOTSTRAP_STAGE=stage3 configure_toolchain || return 1
 
 	if [[ ${compiler_type} == clang ]] ; then
 		if ! type -P clang > /dev/null ; then
@@ -2205,7 +2256,6 @@ bootstrap_stage3() {
 		# (CBUILD, BDEPEND) and with the system being built
 		# (CHOST, RDEPEND).  To correctly bootstrap stage3,
 		# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed.
-		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{12,11,10}/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
 		STAGE=stage3 \
@@ -2388,6 +2438,31 @@ bootstrap_stage3() {
 	PYTHON_COMPAT_OVERRIDE="python$(python_ver)" \
 	pre_emerge_pkgs --nodeps "${compiler_pkgs[@]}" || return 1
 
+	if [[ ${CHOST}:${DARWIN_USE_GCC} == *-darwin*:0 ]] ; then
+		# At this point our libc++abi.dylib is dynamically linked to
+		# /usr/lib/libc++abi.dylib. That causes issues with perl later. Force
+		# rebuild of sys-libs/libcxxabi to break this link.
+		rm -Rf "${ROOT}/var/db/pkg/sys-libs/libcxxabi"*
+		PYTHON_COMPAT_OVERRIDE=python$(python_ver) \
+			pre_emerge_pkgs --nodeps "sys-libs/libcxxabi" || return 1
+
+		# Make ${CHOST}-libtool (used by compiler-rt's and llvm's ebuild) to
+		# point at the correct libtool in stage3. Resolve it in runtime, to
+		# support llvm version upgrades.
+		rm -f ${ROOT}/usr/bin/${CHOST}-libtool
+		{
+			echo "#!${ROOT}/bin/sh"
+			echo 'exec llvm-libtool-darwin "$@"'
+		} > "${ROOT}"/usr/bin/${CHOST}-${bin}
+
+		# Now clang is ready, can use it instead of /usr/bin/gcc
+		# TODO: perhaps symlink the whole etc/portage instead?
+		ln -s -f "${ROOT}/etc/portage/make.profile" \
+			"${ROOT}/tmp/etc/portage/make.profile"
+		cp "${ROOT}/etc/portage/make.conf/0100_bootstrap_prefix_clang.conf" \
+			"${ROOT}/tmp/etc/portage/make.conf/"
+	fi
+
 	# Undo libgcc_s.so path of stage2
 	# Now we have the compiler right there
 	unset CC CXX CPPFLAGS LDFLAGS
@@ -2404,8 +2479,35 @@ bootstrap_stage3() {
 		ln -s bash "${ROOT}"/bin/sh
 	fi
 
+	if [[ "${compiler_type}" == clang ]] ; then
+		if [[ ! -e "${ROOT}"/tmp/etc/env.d/11stage3-llvm ]]; then
+			ln -s "${ROOT}"/etc/env.d/60llvm-* \
+				"${ROOT}"/tmp/etc/env.d/11stage3-llvm
+		fi
+		# Prevent usage of AppleClang aka gcc for bad packages which ignore $CC
+		if [[ ! -e "${ROOT}"/usr/bin/gcc ]]; then
+			echo "#!${ROOT}/bin/bash" > "${ROOT}"/usr/bin/gcc
+			echo "false ${CHOST}-clang \"\$@\"" >> "${ROOT}"/usr/bin/gcc
+		fi
+		if [[ ! -e "${ROOT}"/usr/bin/g++ ]]; then
+			echo "#!${ROOT}/bin/bash" > "${ROOT}"/usr/bin/g++
+			echo "false ${CHOST}-clang++ \"\$@\"" >> "${ROOT}"/usr/bin/g++
+		fi
+		chmod +x "${ROOT}"/usr/bin/{gcc,g++}
+		if [[ ${CHOST} == *-darwin* ]]; then
+			if [[ ! -e "${ROOT}"/usr/bin/ld ]]; then
+				echo "#!${ROOT}/bin/bash" > "${ROOT}"/usr/bin/ld
+				echo "false ld64.lld \"\$@\"" >> "${ROOT}"/usr/bin/ld
+			fi
+			chmod +x "${ROOT}"/usr/bin/ld
+		fi
+	fi
+	
 	# Start using apps from the final destination Prefix
-	export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin"
+	cat > "${ROOT}"/tmp/etc/env.d/10stage3 <<-EOF
+		PATH="${ROOT}/usr/bin:${ROOT}/bin"
+	EOF
+	"${ROOT}"/tmp/usr/sbin/env-update
 
 	# Get a sane bash, overwriting tmp symlinks
 	pre_emerge_pkgs "" "app-shells/bash" || return 1