allow to build xkeyboard w/o xkbcomp on host

package/libxkbfile/Makefile

@@ -15,12 +15,15 @@ PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libxkbfile-install:
 	${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/xkbcomp/Makefile

@@ -11,16 +11,20 @@ PKG_DESCR:=		x11 keyboard compiler
 PKG_SECTION:=		x11/misc
 PKG_BUILDDEP:=		libxkbfile libX11
 PKG_DEPENDS:=		libxkbfile libx11
+HOST_BUILDDEP:=		libxkbfile-host
 PKG_SITES:=		http://xorg.freedesktop.org/releases/X11R7.4/src/everything/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 xkbcomp-install:
 	${INSTALL_DIR} ${IDIR_XKBCOMP}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/xkbcomp ${IDIR_XKBCOMP}/usr/bin
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/xkeyboard-config/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c
 PKG_DESCR:=		keyboard config
 PKG_SECTION:=		x11/misc
-PKG_BUILDDEP:=		util-macros-host xkbcomp meson-host
+PKG_BUILDDEP:=		util-macros-host xkbcomp-host xkbcomp meson-host
 PKG_SITES:=		http://www.x.org/releases/individual/data/xkeyboard-config/
 
 include $(ADK_TOPDIR)/mk/package.mk

scripts/prereq.sh

@@ -771,10 +771,6 @@ else
     NEED_STATIC_LIBSTDCXX="$NEED_STATIC_LIBSTDCXX icu4c"
   fi
 
-  if [ -n "$ADK_PACKAGE_XKEYBOARD_CONFIG" ]; then
-    NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
-  fi
-
   if [ -n "$ADK_PACKAGE_FONT_BH_100DPI" ]; then
     NEED_MKFONTDIR="$NEED_MKFONTDIR font-bh-100dpi"
   fi
@@ -845,13 +841,6 @@ else
     fi
   fi
 
-  if [ -n "$NEED_XKBCOMP" ]; then
-    if ! which xkbcomp >/dev/null 2>&1; then
-      printf "You need xkbcomp to build $NEED_XKBCOMP \n"
-      out=1
-    fi
-  fi
-
   if [ -n "$NEED_JAVA" ]; then
     if ! which java >/dev/null 2>&1; then
       printf "You need java to build $NEED_JAVA \n"