c21d3123ce
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_oclock 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/77c57f68039b4490e70a3d15ca6f4b9e945d12e7 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
23 lines
739 B
Makefile
23 lines
739 B
Makefile
################################################################################
|
|
#
|
|
# xapp_oclock
|
|
#
|
|
################################################################################
|
|
|
|
XAPP_OCLOCK_VERSION = 1.0.4
|
|
XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2
|
|
XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
|
|
XAPP_OCLOCK_LICENSE = MIT
|
|
XAPP_OCLOCK_LICENSE_FILES = COPYING
|
|
XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
|
|
XAPP_OCLOCK_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults
|
|
|
|
ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y)
|
|
XAPP_OCLOCK_CONF_OPTS += --with-xkb
|
|
XAPP_OCLOCK_DEPENDENCIES += xlib_libxkbfile
|
|
else
|
|
XAPP_OCLOCK_CONF_OPTS += --without-xkb
|
|
endif
|
|
|
|
$(eval $(autotools-package))
|