Merge branch 'master' of git+ssh://openadk.org/git/openadk

23 files changed, 289 insertions, 82 deletions

diff --git a/.gitignore b/.gitignore
index 20c57e354..2562c1b7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@
 /all.config
 /target_*/
 /host_*/
+/jhost/
 /pkg_*/
 /root_*/
 /bin/
@@ -41,6 +42,7 @@
 /package/*/Config.in.lib
 /package/*/Config.in.kmod
 /tools_build/
+/jtools_build/
 /extra/
 /.menu
 /target/*/Config.in.systems
diff --git a/jtools/Makefile b/jtools/Makefile
new file mode 100644
index 000000000..932cd298f
--- /dev/null
+++ b/jtools/Makefile
@@ -0,0 +1,29 @@
+# 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
+
+TARGETS:=
+ifneq ($(ADK_PACKAGE_OPENJDK),)
+TARGETS+=fastjar gcj classpath jamvm ecj
+endif
+
+TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
+TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+
+all: install
+compile:
+install: $(TARGETS_INSTALL)
+clean: $(TARGETS_CLEAN)
+
+%-compile: $(TOOLS_BUILD_DIR)
+	$(TRACE) "jtools/$(patsubst %-compile,%,$@)/compile "
+	$(MAKE) -C $(patsubst %-compile,%,$@) compile
+
+%-install:
+	$(TRACE) "jtools/$(patsubst %-install,%,$@)/install "
+	$(MAKE) -C $(patsubst %-install,%,$@) install
+
+%-clean:
+	$(TRACE) "jtools/$(patsubst %-clean,%,$@)/clean "
+	$(MAKE) -C $(patsubst %-clean,%,$@) clean
diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile
new file mode 100644
index 000000000..6d4b76d1f
--- /dev/null
+++ b/jtools/cacao/Makefile
@@ -0,0 +1,35 @@
+# 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:=		cacao
+PKG_VERSION:=		0.99.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/cacao
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
+		--with-vm-zip=$(STAGING_HOST_DIR)/usr/share/cacao/vm.zip \
+		--with-java-runtime-library=gnuclasspath \
+		--with-java-runtime-library-classes=$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip \
+		--with-java-runtime-library-prefix=$(STAGING_HOST_DIR)/usr \
+		--with-jni_md_h=$(STAGING_HOST_DIR)/usr/include \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
new file mode 100644
index 000000000..253f9604d
--- /dev/null
+++ b/jtools/classpath/Makefile
@@ -0,0 +1,36 @@
+# 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:=		classpath
+PKG_VERSION:=		0.98
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		90c6571b8b0309e372faa0f9f6255ea9
+PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \
+		--disable-local-sockets \
+		--disable-alsa \
+		--disable-gconf-peer \
+		--disable-gtk-peer \
+		--disable-qt-peer \
+		--disable-dssi \
+		--disable-plugin \
+		--disable-examples \
+		--disable-Werror)
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD}
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} install
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
new file mode 100644
index 000000000..ffa6cd43e
--- /dev/null
+++ b/jtools/ecj/Makefile
@@ -0,0 +1,23 @@
+# 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:=		1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
+	env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+	PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
+	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -Wl,-Bsymbolic -findirect-dispatch \
+		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \
+		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
+	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/fastjar/Makefile b/jtools/fastjar/Makefile
new file mode 100644
index 000000000..744776eac
--- /dev/null
+++ b/jtools/fastjar/Makefile
@@ -0,0 +1,27 @@
+# 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_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
new file mode 100644
index 000000000..ba31c27ea
--- /dev/null
+++ b/jtools/gcj/Makefile
@@ -0,0 +1,41 @@
+# 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.5.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d6559145853fbaaa0fd7556ed93bce9a
+PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
+DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
+
+WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); \
+		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \
+		./configure --prefix=/usr --enable-java-home --enable-languages=java --with-ffi \
+			--with-mpc=$(STAGING_HOST_DIR) --with-mpfr=$(STAGING_HOST_DIR) \
+			--with-gmp=$(STAGING_HOST_DIR) \
+			--disable-libmudflap \
+                        --disable-libgomp \
+                        --disable-biarch \
+                        --disable-decimal-float \
+                        --disable-multilib \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled
+	$(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR}
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
new file mode 100644
index 000000000..f02450fb0
--- /dev/null
+++ b/jtools/jamvm/Makefile
@@ -0,0 +1,27 @@
+# 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:=		jamvm
+PKG_VERSION:=		1.5.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR) );
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/rules.mk b/jtools/rules.mk
new file mode 100644
index 000000000..7b1d8e866
--- /dev/null
+++ b/jtools/rules.mk
@@ -0,0 +1,7 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+WRKDIR_BASE=    ${JTOOLS_BUILD_DIR}
+WRKDIR=		${WRKDIR_BASE}
+
+include ${TOPDIR}/mk/buildhlp.mk
diff --git a/mk/build.mk b/mk/build.mk
index e4b5866bc..7f1d49838 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -123,9 +123,9 @@ ifeq ($(ADK_NATIVE),y)
 	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
 else
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
-	$(MAKE) -f mk/build.mk toolchain/install tools/install package/compile
+	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile
 else
-	$(MAKE) -f mk/build.mk toolchain/install tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
+	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
 endif
 
@@ -157,6 +157,9 @@ toolchain/%: ${STAGING_DIR}
 tools/%:
 	$(MAKE) -C tools $(patsubst tools/%,%,$@)
 
+jtools/%:
+	$(MAKE) -C jtools $(patsubst jtools/%,%,$@)
+
 image:
 	$(MAKE) -C target image
 
diff --git a/mk/vars.mk b/mk/vars.mk
index f2cea7b59..ee5faec10 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,6 +18,7 @@ STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
+STAGING_JAVA_HOST_DIR:=	${BASE_DIR}/jhost
 # use headers and foo-config from system
 ifneq ($(ADK_NATIVE),)
 STAGING_TARGET_DIR:=
@@ -34,6 +35,7 @@ STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
+JTOOLS_BUILD_DIR=	$(BASE_DIR)/jtools_build
 TOOLS_DIR:=		$(BASE_DIR)/bin/tools
 SCRIPT_DIR:=		$(BASE_DIR)/scripts
 BIN_DIR:=		$(BASE_DIR)/bin/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
@@ -199,7 +201,7 @@ QUIET:=
 else
 QUIET:=			--quiet
 endif
-FETCH_CMD?=		wget --timeout=30 $(QUIET)
+FETCH_CMD?=		wget --timeout=30 -t 3 $(QUIET)
 
 ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 257a8cf12..642b0a245 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
-PKG_VERSION:=		1.2.24
+PKG_VERSION:=		1.4.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		565346cecd9cfecf1463540c6086cc2c
+PKG_MD5SUM:=		99b165f727dd8a5c4b7e2c20a8bf5db6
 PKG_DESCR:=		DBUS library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libexpat
diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init
index 4a1bac9e9..0ccdaad2a 100644
--- a/package/dbus/files/dbus.init
+++ b/package/dbus/files/dbus.init
@@ -11,10 +11,10 @@ autostart)
 	;;
 start)
 	mkdir -p /var/run/dbus
-	/usr/sbin/dbus-daemon --config-file=/etc/dbus-1/system.conf
+	/usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf
 	;;
 stop)
-	kill $(pgrep -f /usr/sbin/dbus-daemon)
+	kill $(pgrep -f /usr/bin/dbus-daemon)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure
deleted file mode 100644
index 18acacbc8..000000000
--- a/package/dbus/patches/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- dbus-1.2.24.orig/configure	2010-03-23 20:11:22.000000000 +0100
-+++ dbus-1.2.24/configure	2011-01-14 19:21:37.000000000 +0100
-@@ -25294,19 +25294,6 @@ if test "x$GCC" = "xyes"; then
-      ;;
-   esac
- 
--  case " $CFLAGS " in
--  *[\ \	]-fPIE[\ \	]*) ;;
--  *) if cc_supports_flag -fPIE; then
--        PIE_CFLAGS="-fPIE"
--        if ld_supports_flag -z,relro; then
--           PIE_LDFLAGS="-pie -Wl,-z,relro"
--        else
--           PIE_LDFLAGS="-pie"
--        fi
--     fi
--     ;;
--  esac
--
-   ### Disabled warnings, and compiler flag overrides
- 
-   # Let's just ignore unused for now
diff --git a/package/dbus/patches/patch-ltmain_sh b/package/dbus/patches/patch-ltmain_sh
deleted file mode 100644
index c594b88f2..000000000
--- a/package/dbus/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,39 +0,0 @@
---- dbus-1.2.24.orig/ltmain.sh	2010-03-12 23:22:29.000000000 +0100
-+++ dbus-1.2.24/ltmain.sh	2011-01-14 19:22:39.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-@@ -5516,27 +5516,6 @@ func_mode_link ()
- 	      esac
- 	    fi
- 
--	    # Hardcode the library path.
--	    # Skip directories that are in the system default run-time
--	    # search path.
--	    case " $sys_lib_dlsearch_path " in
--	    *" $absdir "*) ;;
--	    *)
--	      case "$compile_rpath " in
--	      *" $absdir "*) ;;
--	      *) compile_rpath="$compile_rpath $absdir"
--	      esac
--	      ;;
--	    esac
--	    case " $sys_lib_dlsearch_path " in
--	    *" $libdir "*) ;;
--	    *)
--	      case "$finalize_rpath " in
--	      *" $libdir "*) ;;
--	      *) finalize_rpath="$finalize_rpath $libdir"
--	      esac
--	      ;;
--	    esac
- 	  fi # $linkmode,$pass = prog,link...
- 
- 	  if test "$alldeplibs" = yes &&
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index a09bd20f2..59c6cdcff 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -30,6 +30,8 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif
 
+CONFIGURE_ARGS+=	--disable-xinerama
+
 ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
 CONFIGURE_ENV+=		CXXFLAGS="${TARGET_CXXFLAGS} -fno-threadsafe-statics -fno-builtin -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++" \
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index dd47682c2..016ce5741 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		de83e70453910ac62f9ee2a86444bdab
 PKG_DESCR:=		a system for storing application preferences
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		dbus dbus-glib
+PKG_BUILDDEP:=		dbus dbus-glib orbit2
 PKG_DEPENDS:=		dbus dbus-glib
 PKG_URL:=		http://projects.gnome.org/gconf/
 PKG_SITES:=		ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
@@ -25,5 +25,14 @@ gconf-install:
 	$(INSTALL_DIR) $(IDIR_GCONF)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libgconf*.so* \
 		$(IDIR_GCONF)/usr/lib
+	$(INSTALL_DIR) $(IDIR_GCONF)/usr/lib/GConf/2
+	$(CP) $(WRKINST)/usr/lib/GConf/2/*.so \
+		$(IDIR_GCONF)/usr/lib/GConf/2
+	$(INSTALL_DIR) $(IDIR_GCONF)/usr/libexec
+	$(INSTALL_BIN) $(WRKINST)/usr/libexec/gconfd-2 \
+		$(IDIR_GCONF)/usr/libexec
+	$(INSTALL_DIR) $(IDIR_GCONF)/usr/share/dbus-1/services
+	$(CP) $(WRKINST)/usr/share/dbus-1/services/* \
+		$(IDIR_GCONF)/usr/share/dbus-1/services
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index b26fd863d..8ffb0fe31 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -29,6 +29,9 @@ libidl-install:
 		$(IDIR_LIBIDL)/usr/lib
 
 libidl-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* \
+		$(IDIR_LIBIDL_DEV)/usr/include
 	$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/libIDL-config-2 \
 		$(IDIR_LIBIDL_DEV)/usr/bin
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 73812e426..2f861e053 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -36,6 +36,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+
 ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
 CONFIGURE_ARGS+=	--enable-zero
 endif
@@ -51,7 +52,6 @@ CONFIGURE_ARGS+=	--disable-docs \
 			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
 			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
 			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
-			--with-gcj \
 			--without-rhino \
 			--disable-xrender \
 			--disable-nss
@@ -61,24 +61,27 @@ do-extract:
 	(cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
 
 pre-configure:
-	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status} ; \
+	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
+		env JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" \
 		./configure \
 			--enable-bootstrap \
 			--enable-zero \
+			--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
+			--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
+			--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
+			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
+			--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
+			--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
 			--disable-docs \
 			--disable-openjdk-cross-compilation \
-			--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
-			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
 			--with-xalan2-jar=/usr/share/java/xalan.jar \
 			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
 			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
-			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
-			--with-gcj \
 			--without-rhino \
 			--disable-xrender \
 			--disable-nss \
 	);
-	(cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE} )
+	(cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE})
 
 openjdk-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index db64efe10..491163cde 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -14,9 +14,14 @@ PKG_BUILDDEP:=		libIDL
 PKG_URL:=		http://projects.gnome.org/ORBit2/
 PKG_SITES:=		ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
 
+PKG_SUBPKGS:=		ORBIT2 ORBIT2_DEV
+PKGSD_ORBIT2_DEV:=	orbit2 headers
+PKGSC_ORBIT2_DEV:=	devel
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV}))
 
 CFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --cflags)
 LDFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --libs)
@@ -38,8 +43,19 @@ orbit2-install:
 	$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \
 		$(IDIR_ORBIT2)/usr/lib
+	$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
+		$(IDIR_ORBIT2)/usr/bin
 	$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
 	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
 		$(STAGING_DIR)/usr/bin
 
+orbit2-dev-install:
+	$(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* \
+		$(IDIR_ORBIT2_DEV)/usr/include
+	$(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig
+	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 1b5fc596c..c4110a850 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -4,8 +4,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		qemu
-PKG_VERSION:=		0.13.0
-PKG_RELEASE:=		2
+PKG_VERSION:=		0.14.0
+PKG_RELEASE:=		1
 PKG_MD5SUM:=		397a0d665da8ba9d3b9583629f3d6421
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		misc
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		zlib sdl
 PKG_URL:=		http://wwww.qemu.org/
 PKG_SITES:=		http://wiki.qemu.org/download/
 
-PKG_ARCH_DEPENDS:=	x86 x86_64
+PKG_ARCH_DEPENDS:=	native x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
 
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
 			--prefix=/usr \
 			--sysconfdir=/etc \
 			--bindir=/usr/bin
-TARGET_LDFLAGS+=	-pthread -lrt
+TARGET_LDFLAGS+=	-pthread -lm -lrt
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 893287ee1..93d8e8128 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -23,11 +23,13 @@ include $(TOPDIR)/mk/python.mk
 
 CONFIGURE_ENV+=		PYTHON=$(PYTHON)
 
+post-build:
+	${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb
+	${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb
+
 xcb-proto-install:
 	${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share
 	${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share
-	${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb
-	${CP} ${WRKINST}/usr/share/xcb/* ${STAGING_DIR}/usr/share/xcb
 	${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/lib/pkgconfig
 	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xcb-proto.pc \
 		${IDIR_XCB_PROTO}/usr/lib/pkgconfig
diff --git a/tools/Makefile b/tools/Makefile
index 5d0f91872..3a158b839 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -4,6 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 TARGETS:=adk mkcrypt cpio
+
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))