diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/ccache/ccache/0001-CMake-make-build-of-documentation-optional-842.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/ccache/ccache_4.2.bb | 4 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ccache/ccache/0001-CMake-make-build-of-documentation-optional-842.patch b/meta/recipes-devtools/ccache/ccache/0001-CMake-make-build-of-documentation-optional-842.patch new file mode 100644 index 0000000000..9f6bb1780b --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache/0001-CMake-make-build-of-documentation-optional-842.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 857d74f2c5fff79589e9b35cd405bf8ffffafb54 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz> | ||
3 | Date: Mon, 3 May 2021 18:44:53 +0200 | ||
4 | Subject: [PATCH] CMake: make build of documentation optional (#842) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | So we don't need to support corner cases as for example one fixed in | ||
10 | commit f6202db308e3 ("doc/MANUAL.adoc: Don't use non-ASCII quotes | ||
11 | (#761)") when the documentation is actually not needed at all as ccache | ||
12 | is used as a build tool only. | ||
13 | |||
14 | Signed-off-by: Petr Štetiar <ynezz@true.cz> | ||
15 | Upstream-Status: Backport [b96ca763c453a602b5516b4b9ca5e2829528e318] | ||
16 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
17 | --- | ||
18 | CMakeLists.txt | 5 ++++- | ||
19 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
22 | index 40e21a57..151cc5f7 100644 | ||
23 | --- a/CMakeLists.txt | ||
24 | +++ b/CMakeLists.txt | ||
25 | @@ -131,7 +131,10 @@ target_link_libraries(ccache PRIVATE standard_settings standard_warnings ccache_ | ||
26 | # | ||
27 | # Documentation | ||
28 | # | ||
29 | -add_subdirectory(doc) | ||
30 | +option(ENABLE_DOCUMENTATION "Enable documentation" ON) | ||
31 | +if(ENABLE_DOCUMENTATION) | ||
32 | + add_subdirectory(doc) | ||
33 | +endif() | ||
34 | |||
35 | # | ||
36 | # Installation | ||
diff --git a/meta/recipes-devtools/ccache/ccache_4.2.bb b/meta/recipes-devtools/ccache/ccache_4.2.bb index 9957bc7e65..b76bf043f0 100644 --- a/meta/recipes-devtools/ccache/ccache_4.2.bb +++ b/meta/recipes-devtools/ccache/ccache_4.2.bb | |||
@@ -12,10 +12,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=28afb89f649f309e7ac1aab554564637" | |||
12 | DEPENDS = "zstd" | 12 | DEPENDS = "zstd" |
13 | 13 | ||
14 | SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz" | 14 | SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz" |
15 | SRC_URI += "file://0001-CMake-make-build-of-documentation-optional-842.patch" | ||
16 | |||
15 | SRC_URI[sha256sum] = "dbf139ff32031b54cb47f2d7983269f328df14b5a427882f89f7721e5c411b7e" | 17 | SRC_URI[sha256sum] = "dbf139ff32031b54cb47f2d7983269f328df14b5a427882f89f7721e5c411b7e" |
16 | 18 | ||
17 | UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" | 19 | UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" |
18 | 20 | ||
21 | PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc" | ||
22 | |||
19 | inherit cmake | 23 | inherit cmake |
20 | 24 | ||
21 | PATCHTOOL = "patch" | 25 | PATCHTOOL = "patch" |