[Buildroot] [git commit] xapp_xdm: fix build with pkgconf 1.5.3

Peter Korsgaard peter at korsgaard.com
Fri Dec 14 20:25:09 UTC 2018


commit: https://git.buildroot.net/buildroot/commit/?id=b3b71c72c1080e67108d560fab82442e7c5eae91
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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_xdm 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/08bcba7d7340f34dc66b5b2ab8fbcfbaee309e37

Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/x11r7/xapp_xdm/xapp_xdm.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 2c213a6bf0..422ee53b10 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -20,6 +20,7 @@ XAPP_XDM_DEPENDENCIES = \
 	xlib_libXt \
 	xorgproto
 XAPP_XDM_CONF_OPTS = \
+	--with-appdefaultdir=/usr/share/X11/app-defaults \
 	--with-utmp-file=/var/adm/utmpx \
 	--with-wtmp-file=/var/adm/wtmpx
 


More information about the buildroot mailing list