Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
Date: Wed, 02 Sep 2020 08:33:15
Message-Id: 1599035584.6128f01f2648d14c91363ddc89f868d8938a4b2e.fordfrog@gentoo
1 commit: 6128f01f2648d14c91363ddc89f868d8938a4b2e
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 08:32:47 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 08:33:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6128f01f
7
8 media-sound/audacity: disabled ccache in 2.4.2-r1
9
10 Closes: https://bugs.gentoo.org/735642
11 Package-Manager: Portage-3.0.5, Repoman-3.0.1
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 media-sound/audacity/audacity-2.4.2-r1.ebuild | 1 +
15 .../files/audacity-2.4.2-disable-ccache.patch | 19 +++++++++++++++++++
16 2 files changed, 20 insertions(+)
17
18 diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r1.ebuild
19 index e6c8898ad22..f7df783a70c 100644
20 --- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
21 +++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
22 @@ -65,6 +65,7 @@ PATCHES=(
23 "${FILESDIR}/${P}-fix-gettimeofday.patch"
24 "${FILESDIR}/${P}-fix-metainfo.patch"
25 "${FILESDIR}/${P}-add-missing-include-portaudio.patch"
26 + "${FILESDIR}/${P}-disable-ccache.patch"
27 )
28
29 src_prepare() {
30
31 diff --git a/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch b/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch
32 new file mode 100644
33 index 00000000000..03acf6a2058
34 --- /dev/null
35 +++ b/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch
36 @@ -0,0 +1,19 @@
37 +diff --git a/CMakeLists.txt b/CMakeLists.txt
38 +index 4ff5430..9c9dbf6 100644
39 +--- a/CMakeLists.txt
40 ++++ b/CMakeLists.txt
41 +@@ -69,14 +69,6 @@ set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-proxies/cmake-modules)
42 + set( CMAKE_CXX_STANDARD 14 )
43 + set( CMAKE_CXX_STANDARD_REQUIRED ON )
44 +
45 +-# Use ccache if available
46 +-find_program( CCACHE_PROGRAM ccache )
47 +-mark_as_advanced( FORCE CCACHE_PROGRAM )
48 +-
49 +-if( CCACHE_PROGRAM )
50 +- set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
51 +-endif()
52 +-
53 + # Our very own project
54 + project( Audacity )
55 +