summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-12-13 22:00:33 +0100
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-13 22:14:37 +0100
commit3cd2c0971e2bcb25df5a998036ee740b215bbd39 (patch)
tree1ad3309e88c674ca4ee3e48ab11534c525349a9a
parent1ea3dcd29123485488599e28c791f4f8b8a80fec (diff)
downloadbuildroot-3cd2c0971e2bcb25df5a998036ee740b215bbd39.tar.gz
buildroot-3cd2c0971e2bcb25df5a998036ee740b215bbd39.zip
xapp_viewres: 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_viewres 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/71b5fb2b5df30e25dacdef71f7aaddbecbf8bde6 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/x11r7/xapp_viewres/xapp_viewres.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index 95205b4352..e32de0f732 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -10,5 +10,6 @@ XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_VIEWRES_LICENSE = MIT
XAPP_VIEWRES_LICENSE_FILES = COPYING
XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
+XAPP_VIEWRES_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
$(eval $(autotools-package))
OpenPOWER on IntegriCloud