diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2018-12-13 22:02:09 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-12-13 22:14:37 +0100 |
| commit | f9229e7c4d185dec479522e9484b43fbbd0a8370 (patch) | |
| tree | 7c3aa01dd1899cb51aff2a9a2bb3642b36c1ea2f | |
| parent | 333e16dc5fd0f9bbfbca483b45033cc07e36d654 (diff) | |
| download | buildroot-f9229e7c4d185dec479522e9484b43fbbd0a8370.tar.gz buildroot-f9229e7c4d185dec479522e9484b43fbbd0a8370.zip | |
xapp_bitmap: 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_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@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| -rw-r--r-- | package/x11r7/xapp_bitmap/xapp_bitmap.mk | 1 |
1 files changed, 1 insertions, 0 deletions
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)) |
