diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
| commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
| tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /media-gfx/freecad/files | |
| parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) | |
gentoo resync : 20.03.2021
Diffstat (limited to 'media-gfx/freecad/files')
2 files changed, 29 insertions, 33 deletions
diff --git a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch new file mode 100644 index 000000000000..c8772febdee8 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch @@ -0,0 +1,29 @@ +From 74664bf8c9142320be335ab91dca53cb1a1187a2 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Fri, 12 Mar 2021 23:55:09 +0100 +Subject: [PATCH] [Gentoo specific] Remove ccache usage + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b17736..38e482a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,11 +8,6 @@ if (POLICY CMP0072) + cmake_policy(SET CMP0072 OLD) + endif(POLICY CMP0072) + +-find_program(CCACHE_PROGRAM ccache) #This check should occur before project() +-if(CCACHE_PROGRAM) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") +-endif() +- + project(FreeCAD) + + set(PACKAGE_VERSION_NAME "Vulcan") +-- +2.30.1 + diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch deleted file mode 100644 index 26bb4421077b..000000000000 --- a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bce02c4804d14ae2257ad5f5e7fae4e2baa74503 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl@gmail.com> -Date: Thu, 31 Dec 2020 13:31:47 +0100 -Subject: [PATCH 2/2] CMakeLists.txt: add option for ccache - -Signed-off-by: Bernd Waibel <waebbl@gmail.com> ---- - CMakeLists.txt | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4dabf7..17b9fad 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,9 +8,12 @@ if (POLICY CMP0072) - cmake_policy(SET CMP0072 OLD) - endif(POLICY CMP0072) - --find_program(CCACHE_PROGRAM ccache) #This check should occur before project() --if(CCACHE_PROGRAM) -- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") -+option(FREECAD_USE_CCACHE "Use ccache to build FreeCAD" OFF) -+if(FREECAD_USE_CCACHE) -+ find_program(CCACHE_PROGRAM ccache) #This check should occur before project() -+ if(CCACHE_PROGRAM) -+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") -+ endif() - endif() - - project(FreeCAD) --- -2.30.0 - |