From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 52CF4138335 for ; Wed, 13 Mar 2019 22:45:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D432E0951; Wed, 13 Mar 2019 22:45:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E976E086B for ; Wed, 13 Mar 2019 22:45:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE9DA335D07 for ; Wed, 13 Mar 2019 22:45:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 412B3567 for ; Wed, 13 Mar 2019 22:45:24 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1552517074.4c06333a40da1166407b071e2eebc712b2663c3d.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/cockatrice/files/, games-board/cockatrice/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-board/cockatrice/cockatrice-20190304.ebuild games-board/cockatrice/files/use-ccache.patch X-VCS-Directories: games-board/cockatrice/ games-board/cockatrice/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 4c06333a40da1166407b071e2eebc712b2663c3d X-VCS-Branch: master Date: Wed, 13 Mar 2019 22:45:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 547d475c-5053-46ec-b404-bdb8c17e0efa X-Archives-Hash: ae3d751979727b40b3789907e06df31c commit: 4c06333a40da1166407b071e2eebc712b2663c3d Author: James Le Cuirot gentoo org> AuthorDate: Wed Mar 13 22:44:04 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Wed Mar 13 22:44:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c06333a games-board/cockatrice: Disable automagic use of ccache with a patch This has been submitted upstream. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: James Le Cuirot gentoo.org> games-board/cockatrice/cockatrice-20190304.ebuild | 5 ++++ games-board/cockatrice/files/use-ccache.patch | 33 +++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/games-board/cockatrice/cockatrice-20190304.ebuild b/games-board/cockatrice/cockatrice-20190304.ebuild index bd8edfdaf6b..8d1cd205662 100644 --- a/games-board/cockatrice/cockatrice-20190304.ebuild +++ b/games-board/cockatrice/cockatrice-20190304.ebuild @@ -49,8 +49,13 @@ SHA1='294b433' S="${WORKDIR}/Cockatrice-${MY_PV}" +PATCHES=( + "${FILESDIR}"/use-ccache.patch +) + src_configure() { local mycmakeargs=( + -DUSE_CCACHE=OFF -DWITH_CLIENT=$(usex client) -DWITH_ORACLE=$(usex oracle) -DWITH_SERVER=$(usex server) diff --git a/games-board/cockatrice/files/use-ccache.patch b/games-board/cockatrice/files/use-ccache.patch new file mode 100644 index 00000000000..16deeaf0bb7 --- /dev/null +++ b/games-board/cockatrice/files/use-ccache.patch @@ -0,0 +1,33 @@ +From 494501bbc88d30d9f1ceb6fb3fbd428eeb58ddee Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Wed, 13 Mar 2019 22:18:45 +0000 +Subject: [PATCH] Add USE_CCACHE option to CMake so that ccache can be forcibly + disabled + +--- + CMakeLists.txt | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cc39e77..59eec3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,12 +25,15 @@ ELSE() + ENDIF() + + # Early detect ccache ++OPTION(USE_CCACHE "Cache the build results with ccache" ON) ++if(USE_CCACHE) + find_program(CCACHE_PROGRAM ccache) + if(CCACHE_PROGRAM) + # Support Unix Makefiles and Ninja + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") + MESSAGE(STATUS "Found CCache ${CCACHE_PROGRAM}") + endif() ++endif() + + # A project name is needed for CPack + # Version can be overriden by git tags, see cmake/getversion.cmake +-- +2.20.1 +