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}"
