aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2018-12-14 16:25:17 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-12-14 21:23:06 +0100
commit5a3a7bdbdf91cde6a42c9295de7762bb9df84dad (patch)
tree851cfbcca88640d04cd2f75e33f5959123a67338
parent6bbfaf1d400417b7555fd0c67617cc25c7cc7b68 (diff)
downloadbuildroot-5a3a7bdbdf91cde6a42c9295de7762bb9df84dad.tar.gz
buildroot-5a3a7bdbdf91cde6a42c9295de7762bb9df84dad.tar.bz2
xapp_xmap: 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. xapp_xmap uses the appdefaultdir variable from xt.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 xt.pc. Fixes: - http://autobuild.buildroot.org/results/725c20ec9621a9c2d4b94784785bb481ff74f0e7 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/x11r7/xapp_xman/xapp_xman.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index bca6bbff8d..0d744cc390 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -10,6 +10,7 @@ XAPP_XMAN_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMAN_LICENSE = MIT
XAPP_XMAN_LICENSE_FILES = COPYING
XAPP_XMAN_DEPENDENCIES = xlib_libXaw
+XAPP_XMAN_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
XAPP_XMAN_CONF_ENV = \
ac_cv_file__etc_man_conf=no \