public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [PATCH] cmake-utils.eclass: Override CMAKE_INSTALL_{INFO,MAN}DIR
@ 2018-03-01 15:40 Michał Górny
  2018-03-02  8:53 ` [gentoo-dev] " Michael Palimaka
  0 siblings, 1 reply; 3+ messages in thread
From: Michał Górny @ 2018-03-01 15:40 UTC (permalink / raw
  To: gentoo-dev; +Cc: kde, Michał Górny

Provide an explicit override for CMAKE_INSTALL_INFODIR
and CMAKE_INSTALL_MANDIR to force Gentoo standards for those locations.
This is needed for Gentoo/FreeBSD where CMake defaults to /usr/info
and /usr/man; while PMS specifies /usr/share/info and /usr/share/man
via econf & do* helpers.
---
 eclass/cmake-utils.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b9f69a824b14..636927d66491 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -602,6 +602,8 @@ cmake-utils_src_configure() {
 		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
 		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
+		set (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
+		set (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
-- 
2.16.2



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-dev] Re: [PATCH] cmake-utils.eclass: Override CMAKE_INSTALL_{INFO,MAN}DIR
  2018-03-01 15:40 [gentoo-dev] [PATCH] cmake-utils.eclass: Override CMAKE_INSTALL_{INFO,MAN}DIR Michał Górny
@ 2018-03-02  8:53 ` Michael Palimaka
  2018-03-02  9:36   ` Michał Górny
  0 siblings, 1 reply; 3+ messages in thread
From: Michael Palimaka @ 2018-03-02  8:53 UTC (permalink / raw
  To: gentoo-dev, Michał Górny; +Cc: kde, soap

On 03/02/2018 02:40 AM, Michał Górny wrote:
> Provide an explicit override for CMAKE_INSTALL_INFODIR
> and CMAKE_INSTALL_MANDIR to force Gentoo standards for those locations.
> This is needed for Gentoo/FreeBSD where CMake defaults to /usr/info
> and /usr/man; while PMS specifies /usr/share/info and /usr/share/man
> via econf & do* helpers.
> ---
>  eclass/cmake-utils.eclass | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
> index b9f69a824b14..636927d66491 100644
> --- a/eclass/cmake-utils.eclass
> +++ b/eclass/cmake-utils.eclass
> @@ -602,6 +602,8 @@ cmake-utils_src_configure() {
>  		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
>  		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
>  		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
> +		set (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
> +		set (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
>  	_EOF_
>  	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
>  
> 

There was some discussion in the past about adding these (and some
others), but at that time it was postponed until EAPI 7 due to concerns
about breaking existing packages. What do you think about the risk?


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [gentoo-dev] Re: [PATCH] cmake-utils.eclass: Override CMAKE_INSTALL_{INFO,MAN}DIR
  2018-03-02  8:53 ` [gentoo-dev] " Michael Palimaka
@ 2018-03-02  9:36   ` Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2018-03-02  9:36 UTC (permalink / raw
  To: gentoo-dev; +Cc: kde, soap

W dniu pią, 02.03.2018 o godzinie 19∶53 +1100, użytkownik Michael
Palimaka napisał:
> On 03/02/2018 02:40 AM, Michał Górny wrote:
> > Provide an explicit override for CMAKE_INSTALL_INFODIR
> > and CMAKE_INSTALL_MANDIR to force Gentoo standards for those locations.
> > This is needed for Gentoo/FreeBSD where CMake defaults to /usr/info
> > and /usr/man; while PMS specifies /usr/share/info and /usr/share/man
> > via econf & do* helpers.
> > ---
> >  eclass/cmake-utils.eclass | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
> > index b9f69a824b14..636927d66491 100644
> > --- a/eclass/cmake-utils.eclass
> > +++ b/eclass/cmake-utils.eclass
> > @@ -602,6 +602,8 @@ cmake-utils_src_configure() {
> >  		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
> >  		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
> >  		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
> > +		set (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
> > +		set (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
> >  	_EOF_
> >  	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
> >  
> > 
> 
> There was some discussion in the past about adding these (and some
> others), but at that time it was postponed until EAPI 7 due to concerns
> about breaking existing packages. What do you think about the risk?
> 

I think any real-life breakage is unlikely. GNUInstallDirs are not that
popular, and when they are used we can rather expect upstream to be
sane-ish enough not to redefine them with an incompatible meaning.

Then, even if upstream did something crazy that could be affected
by this, it's just documentation, so we shouldn't expect any major
damage.

-- 
Best regards,
Michał Górny



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-03-02  9:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-01 15:40 [gentoo-dev] [PATCH] cmake-utils.eclass: Override CMAKE_INSTALL_{INFO,MAN}DIR Michał Górny
2018-03-02  8:53 ` [gentoo-dev] " Michael Palimaka
2018-03-02  9:36   ` Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox