| 1 |
On Thu, 2018-03-29 at 21:14 +0200, Michał Górny wrote: |
| 2 |
> Pass the correct docdir for GNUInstallDirs in EAPIs starting with 7. |
| 3 |
> We do not need add it retroactively to avoid breaking something |
| 4 |
> accidentally. |
| 5 |
> --- |
| 6 |
> eclass/cmake-utils.eclass | 6 ++++++ |
| 7 |
> 1 file changed, 6 insertions(+) |
| 8 |
> |
| 9 |
> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 10 |
> index 3302f27608b3..b21822fc03e9 100644 |
| 11 |
> --- a/eclass/cmake-utils.eclass |
| 12 |
> +++ b/eclass/cmake-utils.eclass |
| 13 |
> @@ -614,6 +614,12 @@ cmake-utils_src_configure() { |
| 14 |
> _EOF_ |
| 15 |
> [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET |
| 16 |
> (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" |
| 17 |
> FORCE)' >> "${common_config}" |
| 18 |
> |
| 19 |
> + if [[ ${EAPI} != [56] ]]; then |
| 20 |
> + cat >> "${common_config}" <<- _EOF_ || die |
| 21 |
> + SET (CMAKE_INSTALL_DOCDIR |
| 22 |
> "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") |
| 23 |
> + _EOF_ |
| 24 |
> + fi |
| 25 |
> + |
| 26 |
> # Wipe the default optimization flags out of CMake |
| 27 |
> if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then |
| 28 |
> cat >> ${common_config} <<- _EOF_ || die |
| 29 |
|
| 30 |
Consider whether adding the full absolute path is the way we want to |
| 31 |
go. Setting CMAKE_INSTALL_DOCDIR to "share/doc/${PF}" should suffice. |
Archives