summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-03-08 12:35:42 +0000
committerSam James <sam@gentoo.org>2022-03-08 12:35:42 +0000
commited05625472f4fc5b48ba0d98cb343c4f7d3ba56b (patch)
tree3db20d2c998f04355c3453327a39e71f7b384d4d /dev-util
parentx11-themes/adwaita-icon-theme: Stabilize 41.0 arm, #834426 (diff)
downloadgentoo-ed05625472f4fc5b48ba0d98cb343c4f7d3ba56b.tar.gz
gentoo-ed05625472f4fc5b48ba0d98cb343c4f7d3ba56b.tar.bz2
gentoo-ed05625472f4fc5b48ba0d98cb343c4f7d3ba56b.zip
odev-util/cmake: fix bootstrap in 3.22.3+ (use emake)
Closes: https://bugs.gentoo.org/834759 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/cmake/cmake-3.22.3.ebuild3
-rw-r--r--dev-util/cmake/cmake-3.23.0_rc2.ebuild3
-rw-r--r--dev-util/cmake/cmake-9999.ebuild3
3 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/cmake/cmake-3.22.3.ebuild b/dev-util/cmake/cmake-3.22.3.ebuild
index b8ec458aff01..0d8e28da59fd 100644
--- a/dev-util/cmake/cmake-3.22.3.ebuild
+++ b/dev-util/cmake/cmake-3.22.3.ebuild
@@ -5,7 +5,8 @@ EAPI=8
# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
# ... but seems fine as of 3.22.3?
-#CMAKE_MAKEFILE_GENERATOR="emake"
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
CMAKE_REMOVE_MODULES_LIST=( none )
inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
toolchain-funcs virtualx xdg-utils
diff --git a/dev-util/cmake/cmake-3.23.0_rc2.ebuild b/dev-util/cmake/cmake-3.23.0_rc2.ebuild
index 3ea3a971a1e8..96c6c3f0cae6 100644
--- a/dev-util/cmake/cmake-3.23.0_rc2.ebuild
+++ b/dev-util/cmake/cmake-3.23.0_rc2.ebuild
@@ -5,7 +5,8 @@ EAPI=8
# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
# ... but seems fine as of 3.22.3?
-#CMAKE_MAKEFILE_GENERATOR="emake"
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
CMAKE_REMOVE_MODULES_LIST=( none )
inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
toolchain-funcs virtualx xdg-utils
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index 8dcd76022454..402d531d597d 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -5,7 +5,8 @@ EAPI=8
# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
# ... but seems fine as of 3.22.3?
-#CMAKE_MAKEFILE_GENERATOR="emake"
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
CMAKE_REMOVE_MODULES_LIST=( none )
inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
toolchain-funcs virtualx xdg-utils