util-linux: fix build with pkgconf 1.5.3
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
--- package/util-linux/util-linux.mk | 4 ++++ 1 file changed, 4 insertions(+)
package/util-linux/util-linux.mk +4 -0
@@ -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
Signature · 1 line
2.14.1
PATCH 1/1 util-linux: fix build with pkgconf 1.5.3
Quoted 40 lines
From: "Fabrice Fontaine" <[email protected]>
To: "buildroot" <[email protected]>
Cc: "Carlos Santos" <[email protected]>, "Fabrice Fontaine" <[email protected]>
Sent: S?bado, 15 de dezembro de 2018 11:06:13
Subject: [PATCH 1/1] util-linux: fix build with pkgconf 1.5.3Since 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/caf352a66aa5bd94b93aac39a90b4fa33b39a708Signed-off-by Fabrice Fontaine <[email protected]>---
package/util-linux/util-linux.mk| 4 ++++1 file changed, 4 insertions(+)package/util-linux/util-linux.mk +0
-0@@ -229,6 +229,10 @@ else
UTIL_LINUX_CONF_OPTS+= --without-audit
endifpackage/util-linux/util-linux.mk +4
-1+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +UTIL_LINUX_CONF_OPTS += --with-bashcompletiondir=/usr/share/bash-completion/completions +endif +
Quoted 5 lines
# Install PAM configuration files
ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy) defineUTIL_LINUX_INSTALL_PAMFILES
--
2.14.1
Signature · 1 line
Carlos Santos (Casantos) - DATACOM, P&D
PATCH 1/1 util-linux: fix build with pkgconf 1.5.3
In reply to Fabrice FontaineHi Fabrice,
Quoted 6 lines · 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
fwts?
Quoted 19 lines
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/caf352a66aa5bd94b93aac39a90b4fa33b39a708Signed-off-by Fabrice Fontaine <[email protected]>--- package/util-linux/util-linux.mk | 4 ++++ 1 file changed, 4 insertions(+)package/util-linux/util-linux.mk +0
-0
package/util-linux/util-linux.mk else · line 238
Quoted 10 lines
package/util-linux/util-linux.mk +4
-0@@ -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
Signature · 3 lines
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 -PATCH 1/1 util-linux: fix build with pkgconf 1.5.3
Dear Baruch,
Le sam. 15 d?c. 2018 ? 19:56, Baruch Siach <[email protected]> a ?crit :
Quoted 4 lines
Hi Fabrice,
Fabrice Fontaine writes:
Quoted 8 lines
Quoted 6 lines
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.
Quoted 33 lines
Quoted 20 lines
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/caf352a66aa5bd94b93aac39a90b4fa33b39a708Signed-off-by Fabrice Fontaine <[email protected]>--- package/util-linux/util-linux.mk | 4 ++++ 1 file changed, 4 insertions(+)package/util-linux/util-linux.mk +0
-0package/util-linux/util-linux.mk else · line 238
Quoted 10 lines
package/util-linux/util-linux.mk +4
-0@@ -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_PAMFILESbaruch
Quoted 4 lines
--
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