From 1ffa84c1b3f4a369d6a67e21f83427af1852ff5d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 14 Dec 2018 16:29:34 +0100 Subject: [PATCH] xapp_xditview: 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_xditview 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/af70962c59ca3dd29d85207033125b2e7eda3e81 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xditview/xapp_xditview.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk index 4744c1fefd..e8d72770ea 100644 --- a/package/x11r7/xapp_xditview/xapp_xditview.mk +++ b/package/x11r7/xapp_xditview/xapp_xditview.mk @@ -10,5 +10,6 @@ XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XDITVIEW_LICENSE = MIT XAPP_XDITVIEW_LICENSE_FILES = COPYING XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw +XAPP_XDITVIEW_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults $(eval $(autotools-package)) -- 2.30.2