[Buildroot] [git commit] xapp_bitmap: fix build with pkgconf 1.5.3
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Thu Dec 13 21:14:37 UTC 2018
commit: https://git.buildroot.net/buildroot/commit/?id=f9229e7c4d185dec479522e9484b43fbbd0a8370
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_bitmap 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/44bed7a9251e108f0c3bc8654b757ccc031a1187
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/x11r7/xapp_bitmap/xapp_bitmap.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 851af31382..1ee2880adc 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -10,5 +10,6 @@ XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_BITMAP_LICENSE = MIT
XAPP_BITMAP_LICENSE_FILES = COPYING
XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
+XAPP_BITMAP_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
$(eval $(autotools-package))
More information about the buildroot
mailing list