Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 02 Jun 2018 10:47:30
Message-Id: 1527936429.da2f96d0b25ce88035f1442c965ac64c95994bd8.mgorny@gentoo
1 commit: da2f96d0b25ce88035f1442c965ac64c95994bd8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 29 19:05:54 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 2 10:47:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2f96d0
7
8 cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7
9
10 Pass the correct docdir for GNUInstallDirs in EAPIs starting with 7.
11 We do not need add it retroactively to avoid breaking something
12 accidentally.
13
14 eclass/cmake-utils.eclass | 6 ++++++
15 1 file changed, 6 insertions(+)
16
17 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
18 index 558ff3a1ef9..e64502b3b9b 100644
19 --- a/eclass/cmake-utils.eclass
20 +++ b/eclass/cmake-utils.eclass
21 @@ -614,6 +614,12 @@ cmake-utils_src_configure() {
22 _EOF_
23 [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
24
25 + if [[ ${EAPI} != [56] ]]; then
26 + cat >> "${common_config}" <<- _EOF_ || die
27 + SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
28 + _EOF_
29 + fi
30 +
31 # Wipe the default optimization flags out of CMake
32 if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
33 cat >> ${common_config} <<- _EOF_ || die