mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-12-04 10:53:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

xapp_xedit: 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_xedit 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/1b46f950fc0d957d04c0a60a24176d701ff16bd9

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:26:19 +01:00 committed by Peter Korsgaard
parent 5a3a7bdbdf
commit 72f3e2c0e5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/x11r7/xapp_xedit/xapp_xedit.mk
View File

@ -11,6 +11,8 @@ XAPP_XEDIT_LICENSE = MIT
XAPP_XEDIT_LICENSE_FILES = COPYING
XAPP_XEDIT_DEPENDENCIES = xlib_libXaw
XAPP_XEDIT_CONF_OPTS = --disable-selective-werror
XAPP_XEDIT_CONF_OPTS = \
--disable-selective-werror \
--with-appdefaultdir=/usr/share/X11/app-defaults
$(eval $(autotools-package))