diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2017-04-28 10:39:48 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2017-04-28 10:39:48 +0200 |
| commit | bf490f7f5089f0b5f6dc2919682bfe5d83cab727 (patch) | |
| tree | ccbbdb671d76b999f7d6360ebd3533b112f07c66 | |
| parent | app-misc/pax-utils: add patch for linux-2.6.32, upstream pullreq#2 (diff) | |
| download | prefix-bf490f7f5089f0b5f6dc2919682bfe5d83cab727.tar.gz prefix-bf490f7f5089f0b5f6dc2919682bfe5d83cab727.tar.bz2 prefix-bf490f7f5089f0b5f6dc2919682bfe5d83cab727.zip | |
bootstrap_stage2: mask USE=server for cmake, bug #603012
| -rwxr-xr-x | scripts/bootstrap-prefix.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index e32b41578c..1ce9b1f40b 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -178,10 +178,9 @@ configure_toolchain() { CC=gcc CXX=g++ - # cmake dep is pending #603012 llvm_deps=" app-arch/libarchive - <dev-util/cmake-3.7 + dev-util/cmake dev-util/ninja" case ${CHOST} in *-darwin*) @@ -1486,6 +1485,10 @@ bootstrap_stage2() { [[ ${CHOST} == *-cygwin* ]] || echo "dev-libs/gmp -cxx" >> "${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 + BOOTSTRAP_RAP_STAGE2=yes \ EXTRA_ECONF="--disable-bootstrap" \ GCC_MAKE_TARGET=all \ |