aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2018-12-13 22:06:27 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-13 22:14:38 +0100
commitc21d3123ce85d010bac1c544d39a1708ca0fcc93 (patch)
tree2b3c10aa146cc69f44e134163d703b3968dbc00b /package
parentef7d11bbabc713fa5836f74e07e1646518f93689 (diff)
downloadbuildroot-c21d3123ce85d010bac1c544d39a1708ca0fcc93.tar.gz
buildroot-c21d3123ce85d010bac1c544d39a1708ca0fcc93.tar.bz2
xapp_oclock: 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_oclock 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/77c57f68039b4490e70a3d15ca6f4b9e945d12e7 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package')
-rw-r--r--package/x11r7/xapp_oclock/xapp_oclock.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
index 833d151404..0f94cf8c13 100644
--- a/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -10,6 +10,7 @@ XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_OCLOCK_LICENSE = MIT
XAPP_OCLOCK_LICENSE_FILES = COPYING
XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
+XAPP_OCLOCK_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y)
XAPP_OCLOCK_CONF_OPTS += --with-xkb