NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xapp_xmap: fix build with pkgconf 1.5.3

Browse Source 
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_xmap 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/725c20ec9621a9c2d4b94784785bb481ff74f0e7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2018-12-14 16:25:17 +01:00 committed by Peter Korsgaard
parent 6bbfaf1d40
commit 5a3a7bdbdf
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/x11r7/xapp_xman/xapp_xman.mk
View File

@ -10,6 +10,7 @@ XAPP_XMAN_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMAN_LICENSE = MIT
XAPP_XMAN_LICENSE_FILES = COPYING
XAPP_XMAN_DEPENDENCIES = xlib_libXaw
XAPP_XMAN_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
XAPP_XMAN_CONF_ENV = \
ac_cv_file__etc_man_conf=no \