[Buildroot] [PATCH 1/1] util-linux: fix build with pkgconf 1.5.3

[Buildroot] [PATCH 1/1] util-linux: fix build with pkgconf 1.5.3

[Fabrice Fontaine]

Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute
paths found in the .pc file. This is correct when the paths refer to
something in STAGING_DIR (e.g. libdir, includedir), but not when it
refers to something used for the target.

fwts uses the completionsdir variable from bash-completions.pc to decide
where to install things. Since DESTDIR is prepended to the install
destination, this will end up in the wrong location.

Until a better solution is found in pkgconf, pass the appdefaultdir to
use explicitly instead of relying on bash-completions.pc.

Fixes:
 - http://autobuild.buildroot.org/results/caf352a66aa5bd94b93aac39a90b4fa33b39a708

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/util-linux/util-linux.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index c176d364ce..edbb10d1c8 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -229,6 +229,10 @@ else
 UTIL_LINUX_CONF_OPTS += --without-audit
 endif
 
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+UTIL_LINUX_CONF_OPTS += --with-bashcompletiondir=/usr/share/bash-completion/completions
+endif
+
 # Install PAM configuration files
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy)
 define UTIL_LINUX_INSTALL_PAMFILES
-- 
2.14.1

[Buildroot] [PATCH 1/1] util-linux: fix build with pkgconf 1.5.3

[Carlos Santos]

> From: "Fabrice Fontaine" <fontaine.fabrice@gmail.com>
> To: "buildroot" <buildroot@buildroot.org>
> Cc: "Carlos Santos" <casantos@datacom.com.br>, "Fabrice Fontaine" <fontaine.fabrice@gmail.com>
> Sent: S?bado, 15 de dezembro de 2018 11:06:13
> Subject: [PATCH 1/1] util-linux: fix build with pkgconf 1.5.3

> Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute
> paths found in the .pc file. This is correct when the paths refer to
> something in STAGING_DIR (e.g. libdir, includedir), but not when it
> refers to something used for the target.
> 
> fwts uses the completionsdir variable from bash-completions.pc to decide
> where to install things. Since DESTDIR is prepended to the install
> destination, this will end up in the wrong location.
> 
> Until a better solution is found in pkgconf, pass the appdefaultdir to
> use explicitly instead of relying on bash-completions.pc.
> 
> Fixes:
> -
> http://autobuild.buildroot.org/results/caf352a66aa5bd94b93aac39a90b4fa33b39a708
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/util-linux/util-linux.mk | 4 ++++
> 1 file changed, 4 insertions(+)
> 
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> index c176d364ce..edbb10d1c8 100644
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -229,6 +229,10 @@ else
> UTIL_LINUX_CONF_OPTS += --without-audit
> endif
> 
> +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
> +UTIL_LINUX_CONF_OPTS +=
> --with-bashcompletiondir=/usr/share/bash-completion/completions
> +endif
> +
> # Install PAM configuration files
> ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy)
> define UTIL_LINUX_INSTALL_PAMFILES
> --
> 2.14.1

Reviewed-by: Carlos Santos <casantos@datacom.com.br>

-- 
Carlos Santos (Casantos) - DATACOM, P&D

[Buildroot] [PATCH 1/1] util-linux: fix build with pkgconf 1.5.3

[Baruch Siach]

Hi Fabrice,

Fabrice Fontaine writes:
> Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute
> paths found in the .pc file. This is correct when the paths refer to
> something in STAGING_DIR (e.g. libdir, includedir), but not when it
> refers to something used for the target.
>
> fwts uses the completionsdir variable from bash-completions.pc to decide

fwts?

> where to install things. Since DESTDIR is prepended to the install
> destination, this will end up in the wrong location.
>
> Until a better solution is found in pkgconf, pass the appdefaultdir to
> use explicitly instead of relying on bash-completions.pc.
>
> Fixes:
>  - http://autobuild.buildroot.org/results/caf352a66aa5bd94b93aac39a90b4fa33b39a708
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/util-linux/util-linux.mk | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> index c176d364ce..edbb10d1c8 100644
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -229,6 +229,10 @@ else
>  UTIL_LINUX_CONF_OPTS += --without-audit
>  endif
>  
> +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
> +UTIL_LINUX_CONF_OPTS += --with-bashcompletiondir=/usr/share/bash-completion/completions
> +endif
> +
>  # Install PAM configuration files
>  ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy)
>  define UTIL_LINUX_INSTALL_PAMFILES

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [PATCH 1/1] util-linux: fix build with pkgconf 1.5.3

[Fabrice Fontaine]

Dear Baruch,

Le sam. 15 d?c. 2018 ? 19:56, Baruch Siach <baruch@tkos.co.il> a ?crit :
>
> Hi Fabrice,
>
> Fabrice Fontaine writes:
> > Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute
> > paths found in the .pc file. This is correct when the paths refer to
> > something in STAGING_DIR (e.g. libdir, includedir), but not when it
> > refers to something used for the target.
> >
> > fwts uses the completionsdir variable from bash-completions.pc to decide
>
> fwts?
Indeed, this is a copy/paste error. fwts should be replaced by
util-linux. I'll send a v2.
>
> > where to install things. Since DESTDIR is prepended to the install
> > destination, this will end up in the wrong location.
> >
> > Until a better solution is found in pkgconf, pass the appdefaultdir to
> > use explicitly instead of relying on bash-completions.pc.
> >
> > Fixes:
> >  - http://autobuild.buildroot.org/results/caf352a66aa5bd94b93aac39a90b4fa33b39a708
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> >  package/util-linux/util-linux.mk | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> > index c176d364ce..edbb10d1c8 100644
> > --- a/package/util-linux/util-linux.mk
> > +++ b/package/util-linux/util-linux.mk
> > @@ -229,6 +229,10 @@ else
> >  UTIL_LINUX_CONF_OPTS += --without-audit
> >  endif
> >
> > +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
> > +UTIL_LINUX_CONF_OPTS += --with-bashcompletiondir=/usr/share/bash-completion/completions
> > +endif
> > +
> >  # Install PAM configuration files
> >  ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy)
> >  define UTIL_LINUX_INSTALL_PAMFILES
>
> baruch
>
> --
>      http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
> =}------------------------------------------------ooO--U--Ooo------------{=
>    - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Best Regards,

Fabrice