[Buildroot] [git commit] xapp_xcalc: 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=333e16dc5fd0f9bbfbca483b45033cc07e36d654
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_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 at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/x11r7/xapp_xcalc/xapp_xcalc.mk | 1 +
1 file changed, 1 insertion(+)
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))
More information about the buildroot
mailing list