diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2018-03-14 10:06:11 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2018-03-14 10:06:11 +0100 |
| commit | 7fa0395a9aff1785a8836ec0b7d0518a9d9c41b1 (patch) | |
| tree | 5c8b631a120deea88434d8d9842d1393880bb0eb /scripts | |
| parent | dev-libs/libgcrypt: sync, bug #629410 (diff) | |
| download | prefix-7fa0395a9aff1785a8836ec0b7d0518a9d9c41b1.tar.gz prefix-7fa0395a9aff1785a8836ec0b7d0518a9d9c41b1.tar.bz2 prefix-7fa0395a9aff1785a8836ec0b7d0518a9d9c41b1.zip | |
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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap-prefix.sh | 26 |
1 files 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}" |