From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 08CF71382C5 for ; Mon, 2 Apr 2018 20:26:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD67DE0E76; Mon, 2 Apr 2018 20:26:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 69915E09F3 for ; Mon, 2 Apr 2018 20:26:33 +0000 (UTC) Received: from pomiot (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id A4C7C335CB0; Mon, 2 Apr 2018 20:26:31 +0000 (UTC) Message-ID: <1522700787.21713.2.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH] cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7 From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Date: Mon, 02 Apr 2018 22:26:27 +0200 In-Reply-To: <1522678397.1666.0.camel@gentoo.org> References: <20180329191412.8793-1-mgorny@gentoo.org> <1522678397.1666.0.camel@gentoo.org> Organization: Gentoo Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.24.6 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail 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: aa530705-5f30-4524-819b-aabf4c366841 X-Archives-Hash: 6855119d86a6c024d5f21ff3f19d6530 W dniu pon, 02.04.2018 o godzinie 16∶13 +0200, użytkownik David Seifert napisał: > 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. > I was actually thinking about it (and few other things). I've went with full path for two reasons: a. that's what PMS does for econf, b. and more importantly, it means that when people need to override install prefix (e.g. install to / or /opt/foo), we will still use the correct docdir as defined by Gentoo policy. -- Best regards, Michał Górny