commit: be66c616e363d402e57cb12146fc80e08d8c3805 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Tue Sep 26 21:08:25 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Sep 27 08:33:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be66c616
sci-astronomy/stellarium: simplify disabling of ccache Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/33078 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> .../stellarium/files/stellarium-0.23.3-ccache.patch | 13 ------------- sci-astronomy/stellarium/stellarium-23.3.ebuild | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch b/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch deleted file mode 100644 index e71c9f7f90ea..000000000000 --- a/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch +++ /dev/null @@ -1,13 +0,0 @@ -Don't automagically use ccache https://bugs.gentoo.org/847439 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -196,7 +196,7 @@ IF(OPENGL_DEBUG_LOGGING) - ENDIF() - - # Use ccache if possible --IF(NOT WIN32) -+IF(FALSE) - FIND_PROGRAM(CCACHE_PROGRAM ccache) - IF(CCACHE_PROGRAM) - MESSAGE(STATUS "Found ccache ${CCACHE_PROGRAM}") diff --git a/sci-astronomy/stellarium/stellarium-23.3.ebuild b/sci-astronomy/stellarium/stellarium-23.3.ebuild index 3df848b94c87..0287f1b313ff 100644 --- a/sci-astronomy/stellarium/stellarium-23.3.ebuild +++ b/sci-astronomy/stellarium/stellarium-23.3.ebuild @@ -101,7 +101,6 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch" - "${FILESDIR}/stellarium-0.23.3-ccache.patch" ) VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/stellarium.asc @@ -138,6 +137,7 @@ src_configure() { filter-lto # https://bugs.gentoo.org/862249 local mycmakeargs=( + -DCCACHE_PROGRAM=no -DCPM_LOCAL_PACKAGES_ONLY=yes -DENABLE_GPS="$(usex gps)" -DENABLE_MEDIA="$(usex media)"
