Commit ee363f52 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

xkeyboard-config: add dependency on host-xapp_xkbcomp 



In order to get xkeyboard-config to build, it needs xkbcomp to be
built on the host, i.e host-xapp_xkbcomp. In turn, xapp_xkbcomp needs
xlib_libX11 and xlib_libxkbfile, which in turn need a few libraries.

This commit adds all the relevant dependencies to build everything
that is needed to get xkeyboard-config to build correctly.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 6f518812

package/x11r7/libxcb/libxcb.mk

+3 −0
Original line number Diff line number Diff line
@@ -16,5 +16,8 @@ LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)" 
HOST_PYTHON_VERSION=$(shell python --version 2>&1 | sed 's/Python \([0-9]\.[^\.]\).*/\1/')

LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XCBPROTO_XCBPYTHONDIR=$(STAGING_DIR)/usr/lib/python$(HOST_PYTHON_VERSION)/site-packages



HOST_LIBXCB_DEPENDENCIES = host-libxslt host-pthread-stubs host-xcb-proto host-xlib_libXdmcp host-xlib_libXau



$(eval $(call AUTOTARGETS,package/x11r7,libxcb))

$(eval $(call AUTOTARGETS,package/x11r7,libxcb,host))

package/x11r7/pthread-stubs/pthread-stubs.mk

+1 −0
Original line number Diff line number Diff line
@@ -11,4 +11,5 @@ PTHREAD_STUBS_LIBTOOL_PATCH = NO 
PTHREAD_STUBS_INSTALL_STAGING = YES



$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs))

$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs,host))

package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk

+2 −0
Original line number Diff line number Diff line
@@ -9,5 +9,7 @@ XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 
XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app

XAPP_XKBCOMP_AUTORECONF = NO

XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile

HOST_XAPP_XKBCOMP_DEPENDENCIES = host-xlib_libX11 host-xlib_libxkbfile



$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp))

$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp,host))

package/x11r7/xcb-proto/xcb-proto.mk

+1 −0
Original line number Diff line number Diff line
@@ -10,4 +10,5 @@ XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/ 
XCB_PROTO_INSTALL_STAGING = YES



$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto))

$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto,host))

package/x11r7/xkeyboard-config/xkeyboard-config.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ XKEYBOARD_CONFIG_AUTORECONF = NO 
XKEYBOARD_CONFIG_INSTALL_STAGING = NO

XKEYBOARD_CONFIG_INSTALL_TARGET = YES

XKEYBOARD_CONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install

XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool

XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp



XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt