diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2018-12-13 22:01:15 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-12-13 22:14:37 +0100 |
| commit | 333e16dc5fd0f9bbfbca483b45033cc07e36d654 (patch) | |
| tree | 8facf5b880f72085e7f6d9c929cfae7f1840c1e7 | |
| parent | 3cd2c0971e2bcb25df5a998036ee740b215bbd39 (diff) | |
| download | buildroot-333e16dc5fd0f9bbfbca483b45033cc07e36d654.tar.gz buildroot-333e16dc5fd0f9bbfbca483b45033cc07e36d654.zip | |
xapp_xcalc: 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_xcalc 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/6d906fc092e86ecf4214a69a5f087efabab4ade8
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| -rw-r--r-- | package/x11r7/xapp_xcalc/xapp_xcalc.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk index 58fbdf5710..9445af75e7 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk @@ -11,5 +11,6 @@ XAPP_XCALC_LICENSE = MIT XAPP_XCALC_LICENSE_FILES = COPYING XAPP_XCALC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec install-data XAPP_XCALC_DEPENDENCIES = xlib_libXaw +XAPP_XCALC_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults $(eval $(autotools-package)) |
