remove jtools/java host dir. use host stuff instead.

fix arm building.

31 files changed, 452 insertions, 28 deletions

diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 10726ac09..027aa4da0 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -9,16 +9,20 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		69129a7c37697f81ac092335e9fa452b
 PKG_DESCR:=		ALSA sound library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		alsa-lib-host
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/lib/
 PKG_OPTS:=		dev
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 TARGET_CPPFLAGS+=	-D_POSIX_C_SOURCE=1
 CONFIGURE_ARGS+=	--disable-python
 
@@ -27,4 +31,5 @@ alsa-lib-install:
 	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ant/Makefile b/package/ant/Makefile
new file mode 100644
index 000000000..5476596eb
--- /dev/null
+++ b/package/ant/Makefile
@@ -0,0 +1,42 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		ant
+PKG_VERSION:=		1.8.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
+PKG_DESCR:=		ant utility
+PKG_SECTION:=		lang
+PKG_SITES:=		http://archive.apache.org/dist/ant/source/
+
+DISTFILES:=             apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
+WRKDIST=                $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,ANT,ant,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		manual
+
+host-build:
+	if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \
+		cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar; \
+	fi
+	cp $(STAGING_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional
+	cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \
+		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \
+		JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ; \
+		$(BASH) build.sh
+
+ant-hostinstall:
+	cd $(WRKBUILD)/dist; \
+	$(CP) bin/* $(STAGING_HOST_DIR)/usr/bin ; \
+	$(CP) lib/* $(STAGING_HOST_DIR)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index e63c84e7a..0a8e7e682 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -17,10 +17,21 @@ PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
 PKG_HOST_DEPENDS:=	linux
 PKG_ARCH_DEPENDS:=	!cris !arm
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--disable-plugin \
+			--disable-tools \
+			--disable-examples \
+			--disable-gtk-peer \
+			--disable-gconf-peer \
+			--disable-alsa \
+			--disable-Werror \
+			--without-x
 CONFIGURE_ARGS+=	--disable-plugin \
 			--disable-tools \
 			--disable-examples
@@ -37,4 +48,5 @@ classpath-install:
 	$(CP) $(WRKINST)/usr/share/classpath/glibj.zip \
 		$(STAGING_DIR)/usr/share/classpath
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/classpath/patches/classpath-fix.patch b/package/classpath/patches/classpath-fix.patch
new file mode 100644
index 000000000..e03eb2342
--- /dev/null
+++ b/package/classpath/patches/classpath-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur classpath-0.98.orig//lib/Makefile.in classpath-0.98/lib/Makefile.in
+--- classpath-0.98.orig//lib/Makefile.in	2009-02-06 02:01:32.000000000 +0100
++++ classpath-0.98/lib/Makefile.in	2011-08-05 22:55:25.965284504 +0200
+@@ -272,7 +272,7 @@
+ uudecode = @uudecode@
+ vm_classes = @vm_classes@
+ JAVA_DEPEND = java.dep
+-compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(PATH_TO_GLIBJ_ZIP):$(PATH_TO_ESCHER)
++compile_classpath = $(vm_classes) -cp $(top_srcdir) -cp $(top_srcdir)/external/w3c_dom -cp $(top_srcdir)/external/sax -cp $(top_srcdir)/external/relaxngDatatype -cp $(top_srcdir)/external/jsr166 -cp . -cp $(PATH_TO_GLIBJ_ZIP) -cp $(PATH_TO_ESCHER)
+ @GCJ_JAVAC_FALSE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5 -bootclasspath '' -classpath $(compile_classpath) -d . @classes
+ 
+ # handling source to bytecode compiler programs like gcj, jikes  and kjc
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
new file mode 100644
index 000000000..37a463eb1
--- /dev/null
+++ b/package/ecj/Makefile
@@ -0,0 +1,43 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		ecj
+PKG_VERSION:=		4.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
+PKG_DESCR:=		ecj java compiler
+PKG_SECTION:=		lang
+
+NO_DISTFILES:=		1
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,ECJ,ecj,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		manual
+
+ecj-hostinstall:
+	env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \
+	$(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \
+		-o ${STAGING_HOST_DIR}/usr/bin/ecj.native \
+		--main=org.eclipse.jdt.internal.compiler.batch.Main \
+		$(DISTDIR)/ecj.jar
+	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \
+		${STAGING_HOST_DIR}/usr/bin/ecj
+	chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj
+	# put a wrapper for java here
+	mv ${STAGING_HOST_DIR}/usr/bin/gij ${STAGING_HOST_DIR}/usr/bin/gij.native
+	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
+		${STAGING_HOST_DIR}/usr/bin/java
+	chmod u+x ${STAGING_HOST_DIR}/usr/bin/java
+	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
+		${STAGING_HOST_DIR}/usr/bin/gij
+	chmod u+x ${STAGING_HOST_DIR}/usr/bin/gij
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile
new file mode 100644
index 000000000..e14c66076
--- /dev/null
+++ b/package/fastjar/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		fastjar
+PKG_VERSION:=		0.94
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		14d4bdfac236e347d806c6743dba48c6
+PKG_DESCR:=		fastjar utility
+PKG_SECTION:=		lang
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,FASTJAR,fastjar,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index b5d239569..492adb046 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		a359993ad0dc23323c676b04fdb57110
 PKG_DESCR:=		A free, high-quality and portable font engine
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP:=		zlib
+PKG_BUILDDEP:=		zlib freetype-host
 PKG_URL:=		http://www.freetype.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freetype/}
 PKG_LIBNAME:=		libfreetype
@@ -20,14 +20,18 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--without-png
 
 libfreetype-install:
 	${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
new file mode 100644
index 000000000..f7669a740
--- /dev/null
+++ b/package/gcj/Makefile
@@ -0,0 +1,47 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		gcj
+PKG_VERSION:=		4.7.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		86f428a30379bdee0224e353ee2f999e
+PKG_DESCR:=		GNU java compiler
+PKG_SECTION:=		lang
+PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
+DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
+
+PKG_ARCH_DEPENDS:=	native
+WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,GCJ,gcj,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		auto
+HOST_MAKE_ENV+=		"JAR=no LDFLAGS=-liconv"
+HOST_CONFIGURE_ARGS:=	\
+			--enable-java-home \
+			--enable-languages=java \
+			--enable-shared \
+			--with-ffi \
+			--with-mpc=$(STAGING_HOST_DIR) \
+			--with-mpfr=$(STAGING_HOST_DIR) \
+			--with-gmp=$(STAGING_HOST_DIR) \
+			--disable-nls \
+			--without-libiconv-prefix \
+			--disable-libmudflap \
+			--disable-libgomp \
+			--disable-biarch \
+			--disable-decimal-float \
+			--disable-multilib \
+			--disable-bootstrap
+
+post-extract:
+	(cd $(DISTDIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
+	(cd $(WRKBUILD); $(CP) $(DISTDIR)/ecj.jar .)
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index 42743b47d..53180cfbe 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -8,12 +8,18 @@ PKG_VERSION:=		2.2
 PKG_RELEASE:=		1
 PKG_DESCR:=		X Input Extension headers
 PKG_SECTION:=		devel
+PKG_BUILDDEP:=		inputproto-host
 PKG_MD5SUM:=		e0047823230413e67d74e92af77fbe58
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,INPUTPROTO,inputproto,$(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
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 6cca7f5d8..22f20455a 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -16,10 +16,14 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
 PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--with-classpath-install-dir=$(STAGING_HOST_DIR)/usr
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
@@ -31,6 +35,10 @@ ifeq ($(ARCH),arm)
 CONFIGURE_ARGS+=	--disable-tls
 endif
 
+hostpost-install:
+	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java
+	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/java
+
 do-build:
 	${INSTALL_DIR} ${WRKINST}/usr/bin
 	${INSTALL_DIR} ${WRKINST}/usr/share/jamvm
@@ -47,4 +55,5 @@ do-install:
 	${CP} ${WRKINST}/usr/share/jamvm/classes.zip \
 		${IDIR_JAMVM}/usr/share/jamvm
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/jikes/Makefile b/package/jikes/Makefile
new file mode 100644
index 000000000..6f7649a49
--- /dev/null
+++ b/package/jikes/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		jikes
+PKG_VERSION:=		1.22
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		cda958c7fef6b43b803e1d1ef9afcb85
+PKG_DESCR:=		jikes java compiler
+PKG_SECTION:=		lang
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		auto
+
+hostpost-install:
+	$(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/bin/
+	$(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/
+	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac
+	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac
+
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile
index 202109637..3d9708d0c 100644
--- a/package/kbproto/Makefile
+++ b/package/kbproto/Makefile
@@ -8,12 +8,18 @@ PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		1
 PKG_DESCR:=		X11 keyboard protocol headers
 PKG_SECTION:=		devel
+PKG_BUILDDEP:=		kbproto-host
 PKG_MD5SUM:=		9c650b7947fe59b3f144518400e8d029
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,KBPROTO,kbproto,$(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
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index aab03316f..3eb19785e 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -9,19 +9,23 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		4b8dae73fce37e994c3a6fa05d6db7ca
 PKG_DESCR:=		Inter-Client Exchange library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xtrans xproto
+PKG_BUILDDEP:=		xtrans-host xtrans xproto-host xproto libICE-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libice
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 
 libice-install:
 	${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index 4b9a9eae4..56ea8e604 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -10,17 +10,22 @@ PKG_MD5SUM:=		1d507651e9fa50aab7ef11be9e0e2f20
 PKG_DESCR:=		X11 Session Management library
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libuuid
-PKG_BUILDDEP:=		libICE util-linux
+PKG_BUILDDEP:=		libSM-host libICE util-linux
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libsm
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
 libsm-install:
 	${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libSM.so* ${IDIR_LIBSM}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 78078cf83..8ab881ec2 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -9,7 +9,9 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		395455e4d3a51459374fe5ca8420aae8
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto-host
+PKG_BUILDDEP:=		xproto-host xextproto-host libXau-host libpthread-stubs-host
+PKG_BUILDDEP+=		xcb-proto-host libxcb-host kbproto-host
+PKG_BUILDDEP+=		inputproto-host xtrans-host libX11-host
 PKG_BUILDDEP+=		xproto xextproto xtrans libXdmcp libXau xcb-proto
 PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto libxcb
 PKG_DEPENDS:=		libxdmcp libxcb libxau
@@ -21,14 +23,18 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-specs \
 			--disable-xf86bigfont \
 			--disable-malloc0returnsnull
+HOST_CONFIGURE_ARGS+=	$(CONFIGURE_ARGS)
 
 libx11-install:
 	${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
@@ -37,4 +43,5 @@ libx11-install:
 	${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index ad7ff606e..363a0b2a3 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		3ab7a4d1aac1b7f8ccc6b9755a19f252
 PKG_DESCR:=		X11 authorisation library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto
+PKG_BUILDDEP:=		xproto libXau-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxau
 PKG_OPTS:=		dev
@@ -18,12 +18,17 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
 libxau-install:
 	${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 1d60babd8..c01665b93 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		249478eae5c4fab7722894cb99565405
 PKG_DESCR:=		X client interface to extensions of the X protocol
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		libX11 xextproto
+PKG_BUILDDEP:=		libX11 xextproto libXext-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxext
 PKG_OPTS:=		dev
@@ -18,14 +18,18 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 libxext-install:
 	${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 0e204f07c..08e801043 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		d024a9de73191628f9772893f02054d8
 PKG_DESCR:=		X Window System client interface to the XINPUT extension to the X protocol.
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto xextproto libXext
+PKG_BUILDDEP:=		xproto xextproto libXext libXi-host
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxi
@@ -19,10 +19,13 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 libxi-install:
@@ -30,4 +33,5 @@ libxi-install:
 	$(CP) $(WRKINST)/usr/lib/libXi*.so* \
 		$(IDIR_LIBXI)/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile
index ffef8c88d..2887aaf71 100644
--- a/package/libXinerama/Makefile
+++ b/package/libXinerama/Makefile
@@ -9,19 +9,23 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		29a813b3850d499a3524a8d5d5ecb099
 PKG_DESCR:=		Xinerama library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xineramaproto
+PKG_BUILDDEP:=		xineramaproto-host xineramaproto libXext-host libXinerama-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxinerama
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
 libxinerama-install:
 	${INSTALL_DIR} ${IDIR_LIBXINERAMA}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXinerama.so* ${IDIR_LIBXINERAMA}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 69cd67d2f..32b4483d0 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -5,20 +5,24 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXt
 PKG_VERSION:=		1.1.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		7a80ed7aba06668b12ebd0910318a1f1
 PKG_DESCR:=		X Toolkit Intrinsics libraries
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libsm libice libuuid libx11 libxau libxdmcp libxcb
+PKG_BUILDDEP:=		autotool util-macros-host libXt-host
 PKG_BUILDDEP:=		autotool libSM libX11 kbproto util-macros
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxt
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
@@ -27,4 +31,5 @@ libxt-install:
 	${INSTALL_DIR} ${IDIR_LIBXT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXt.so* ${IDIR_LIBXT}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile
index 5a9c07704..75ec95913 100644
--- a/package/libXtst/Makefile
+++ b/package/libXtst/Makefile
@@ -9,19 +9,23 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		8918809e47c29b44d25eb16b1586a15b
 PKG_DESCR:=		Xtst library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		recordproto libXi
+PKG_BUILDDEP:=		recordproto-host recordproto libXi libXi-host libXtst-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxtst
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
 libxtst-install:
 	${INSTALL_DIR} ${IDIR_LIBXTST}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXtst.so* ${IDIR_LIBXTST}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index 1a3194960..0b316720d 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -22,8 +22,8 @@ $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 
 AUTOTOOL_STYLE:=	autoreconf
 HOST_STYLE:=		auto
-HOST_CONFIGURE_ARGS+=	--disable-builddir
-CONFIGURE_ARGS+=	--disable-builddir
+HOST_CONFIGURE_ARGS+=	--disable-builddir --with-pic
+CONFIGURE_ARGS+=	--disable-builddir --with-pic
 
 libffi-install:
 	${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib
diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile
index 6278f9a3a..9f12523ef 100644
--- a/package/libpthread-stubs/Makefile
+++ b/package/libpthread-stubs/Makefile
@@ -9,12 +9,18 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		a09d928c4af54fe5436002345ef71138
 PKG_DESCR:=		Pthread-stubs
 PKG_SECTION:=		devel
+PKG_BUILDDEP:=		libpthread-stubs-host
 PKG_URL:=		http://xcb.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBPTHREAD_STUBS,libpthread-stubs,$(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
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index f394cc10f..713a6c3a3 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -9,16 +9,21 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		324c76024a73dba8a902638696ba87de
 PKG_DESCR:=		X11 keyboard library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		python2 libpthread-stubs libxslt libXau xcb-proto
+PKG_BUILDDEP:=		libXau-host libpthread-stubs-host xcb-proto-host
+PKG_BUILDDEP+=		libxcb-host
+PKG_BUILDDEP+=		python2 libpthread-stubs libxslt libXau xcb-proto
 PKG_SITES:=		http://xcb.freedesktop.org/dist/
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXCB,