public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] [PATCH] cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7
Date: Mon, 02 Apr 2018 22:26:27 +0200	[thread overview]
Message-ID: <1522700787.21713.2.camel@gentoo.org> (raw)
In-Reply-To: <1522678397.1666.0.camel@gentoo.org>

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



      reply	other threads:[~2018-04-02 20:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-29 19:14 [gentoo-dev] [PATCH] cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7 Michał Górny
2018-04-02 14:13 ` David Seifert
2018-04-02 20:26   ` Michał Górny [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1522700787.21713.2.camel@gentoo.org \
    --to=mgorny@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox