use xproto-host

package/libX11/Makefile

@@ -9,7 +9,8 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		395455e4d3a51459374fe5ca8420aae8
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto xextproto xtrans libXdmcp libXau xcb-proto
+PKG_BUILDDEP:=		xproto-host
+PKG_BUILDDEP+=		xproto xextproto xtrans libXdmcp libXau xcb-proto
 PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto libxcb
 PKG_DEPENDS:=		libxdmcp libxcb libxau
 PKG_SITES:=		${MASTER_SITE_XORG}

package/libxml2/Makefile

@@ -35,6 +35,7 @@ include $(TOPDIR)/mk/python.mk
 
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--without-python
+HOST_MAKE_FLAGS+=	LDFLAGS=-lpthread
 
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_CFLAGS:=		$(filter-out -flto,$(TARGET_CFLAGS))

package/xproto/Makefile

@@ -9,11 +9,17 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		X Window System Core Protocol headers
 PKG_SECTION:=		devel
 PKG_MD5SUM:=		7ab1239930563a352cb3552fd2db4140
+PKG_BUILDDEP:=		xproto-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

scripts/scan-pkgs.sh

@@ -61,10 +61,6 @@ if [[ -n $ADK_NATIVE ]];then
 	fi
 fi
 
-if [[ -n $ADK_PACKAGE_LIBX11 ]]; then
-	NEED_X11="$NEED_X11 libx11"
-fi
-
 if [[ -n $ADK_COMPILE_OPENJDK ]]; then
 	NEED_GXX="$NEED_GXX openjdk"
 	NEED_XSLTPROC="$NEED_XSLTPROC openjdk"
@@ -209,15 +205,6 @@ if [[ -n $NEED_X11DEV ]];then
 	fi
 fi
 
-if [[ -n $NEED_X11 ]];then
-	if ! test -f /usr/include/X11/X.h >/dev/null; then
-	  if ! test -f /usr/local/include/X11/X.h >/dev/null; then
-		echo >&2 You need X11 headers to build $NEED_X11
-		out=1
-	  fi
-	fi
-fi
-
 if [[ -n $NEED_XEXTDEV ]];then
 	if ! test -f /usr/include/X11/extensions/XShm.h >/dev/null; then
 		echo >&2 You need X11 extensions headers to build $NEED_XEXTDEV