From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-dev+bounces-84355-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id B12D71382C5
	for <garchives@archives.gentoo.org>; Mon,  2 Apr 2018 14:13:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 94A04E0D65;
	Mon,  2 Apr 2018 14:13:31 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 39B0EE0A07
	for <gentoo-dev@lists.gentoo.org>; Mon,  2 Apr 2018 14:13:31 +0000 (UTC)
Received: from [IPv6:2003:e2:ef00:be00:ea70:7db5:49c2:bcad] (p200300E2EF00BE00EA707DB549C2BCAD.dip0.t-ipconnect.de [IPv6:2003:e2:ef00:be00:ea70:7db5:49c2:bcad])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	(Authenticated sender: soap)
	by smtp.gentoo.org (Postfix) with ESMTPSA id 3BFD433BF08;
	Mon,  2 Apr 2018 14:13:25 +0000 (UTC)
Message-ID: <1522678397.1666.0.camel@gentoo.org>
Subject: Re: [gentoo-dev] [PATCH] cmake-utils.eclass: Override
 CMAKE_INSTALL_DOCDIR in EAPI 7
From: David Seifert <soap@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 02 Apr 2018 16:13:17 +0200
In-Reply-To: <20180329191412.8793-1-mgorny@gentoo.org>
References: <20180329191412.8793-1-mgorny@gentoo.org>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.24.6 
Precedence: bulk
List-Post: <mailto:gentoo-dev@lists.gentoo.org>
List-Help: <mailto:gentoo-dev+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org>
X-BeenThere: gentoo-dev@lists.gentoo.org
Reply-to: gentoo-dev@lists.gentoo.org
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Archives-Salt: 4aa5cbe7-0025-4041-b094-df346a7c20be
X-Archives-Hash: 3c2e7642340a1b88119a8eeacfe3c5c2

On Thu, 2018-03-29 at 21:14 +0200, Michał Górny wrote:
> Pass the correct docdir for GNUInstallDirs in EAPIs starting with 7.
> We do not need add it retroactively to avoid breaking something
> accidentally.
> ---
>  eclass/cmake-utils.eclass | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
> index 3302f27608b3..b21822fc03e9 100644
> --- a/eclass/cmake-utils.eclass
> +++ b/eclass/cmake-utils.eclass
> @@ -614,6 +614,12 @@ cmake-utils_src_configure() {
>  	_EOF_
>  	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET
> (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make"
> FORCE)' >> "${common_config}"
>  
> +	if [[ ${EAPI} != [56] ]]; then
> +		cat >> "${common_config}" <<- _EOF_ || die
> +			SET (CMAKE_INSTALL_DOCDIR
> "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
> +		_EOF_
> +	fi
> +
>  	# Wipe the default optimization flags out of CMake
>  	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
>  		cat >> ${common_config} <<- _EOF_ || die

Consider whether adding the full absolute path is the way we want to
go. Setting CMAKE_INSTALL_DOCDIR to "share/doc/${PF}" should suffice.