aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2018-12-14 16:47:28 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-12-14 21:28:48 +0100
commit295379641007abb672398c9a32ce4bfaa1612d2a (patch)
tree1662228354af17e30d582a675f6213fa9aafa764 /package
parentb3b71c72c1080e67108d560fab82442e7c5eae91 (diff)
downloadbuildroot-295379641007abb672398c9a32ce4bfaa1612d2a.tar.gz
buildroot-295379641007abb672398c9a32ce4bfaa1612d2a.tar.bz2
kmod: 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. kmod 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/f8a1f956333062027294e766ff0ddab5c35d5887 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package')
-rw-r--r--package/kmod/kmod.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index c165ea3020..ea5d291133 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -28,6 +28,10 @@ KMOD_CONF_OPTS = --disable-static --enable-shared
KMOD_CONF_OPTS += --disable-manpages
HOST_KMOD_CONF_OPTS = --disable-manpages
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+KMOD_CONF_OPTS += --with-bashcompletiondir=/usr/share/bash-completion/completions
+endif
+
ifeq ($(BR2_PACKAGE_ZLIB),y)
KMOD_DEPENDENCIES += zlib
KMOD_CONF_OPTS += --with-zlib