diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2018-12-13 21:59:52 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-12-13 22:13:50 +0100 |
| commit | 1ea3dcd29123485488599e28c791f4f8b8a80fec (patch) | |
| tree | c2c964a259f9aa7868d45278fe56936c773321ce | |
| parent | 5d92c696cc80e76946444f812412b25cea4c860d (diff) | |
| download | buildroot-1ea3dcd29123485488599e28c791f4f8b8a80fec.tar.gz buildroot-1ea3dcd29123485488599e28c791f4f8b8a80fec.zip | |
xapp_beforelight: 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_beforelight 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/164bb80f261f48525de508b5f74321f2fec91cce
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| -rw-r--r-- | package/x11r7/xapp_beforelight/xapp_beforelight.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk index b39fe7870e..7dcb715ef3 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk @@ -10,5 +10,6 @@ XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_BEFORELIGHT_LICENSE = MIT XAPP_BEFORELIGHT_LICENSE_FILES = COPYING XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt +XAPP_BEFORELIGHT_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults $(eval $(autotools-package)) |
