summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jtools/Makefile30
-rw-r--r--jtools/ant/Makefile33
-rw-r--r--jtools/ant/junit-4.9b2.jarbin246250 -> 0 bytes
-rw-r--r--jtools/classpath/Makefile42
-rw-r--r--jtools/ecj/Makefile36
-rw-r--r--jtools/fastjar/Makefile27
-rw-r--r--jtools/files.needed11
-rw-r--r--jtools/jamvm/Makefile34
-rw-r--r--jtools/jikes/Makefile31
-rw-r--r--jtools/openjdk7/Makefile58
-rw-r--r--jtools/openjdk7/patches/openadk.patch39
-rw-r--r--jtools/prereq.sh27
-rw-r--r--jtools/qemu/Makefile32
-rw-r--r--jtools/rules.mk8
-rw-r--r--mk/build.mk20
-rw-r--r--mk/vars.mk2
-rw-r--r--package/alsa-lib/Makefile5
-rw-r--r--package/ant/Makefile42
-rw-r--r--package/classpath/Makefile12
-rw-r--r--package/classpath/patches/classpath-fix.patch (renamed from jtools/classpath/patches/classpath-fix.patch)0
-rw-r--r--package/ecj/Makefile43
-rw-r--r--package/fastjar/Makefile24
-rw-r--r--package/freetype/Makefile6
-rw-r--r--package/gcj/Makefile (renamed from jtools/gcj/Makefile)37
-rw-r--r--package/inputproto/Makefile6
-rw-r--r--package/jamvm/Makefile9
-rw-r--r--package/jikes/Makefile33
-rw-r--r--package/kbproto/Makefile6
-rw-r--r--package/libICE/Makefile6
-rw-r--r--package/libSM/Makefile7
-rw-r--r--package/libX11/Makefile9
-rw-r--r--package/libXau/Makefile7
-rw-r--r--package/libXext/Makefile6
-rw-r--r--package/libXi/Makefile6
-rw-r--r--package/libXinerama/Makefile6
-rw-r--r--package/libXt/Makefile7
-rw-r--r--package/libXtst/Makefile6
-rw-r--r--package/libffi/Makefile4
-rw-r--r--package/libpthread-stubs/Makefile6
-rw-r--r--package/libxcb/Makefile8
-rw-r--r--package/openjdk7/Makefile56
-rw-r--r--package/openjdk7/patches/openadk.patch67
-rw-r--r--package/recordproto/Makefile6
-rw-r--r--package/xcb-proto/Makefile10
-rw-r--r--package/xextproto/Makefile6
-rw-r--r--package/xineramaproto/Makefile6
-rw-r--r--package/xtrans/Makefile6
-rw-r--r--scripts/scan-pkgs.sh15
48 files changed, 417 insertions, 486 deletions
diff --git a/jtools/Makefile b/jtools/Makefile
deleted file mode 100644
index 23d93a6d4..000000000
--- a/jtools/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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:=
-# jikes is for ant
-ifneq ($(ADK_PACKAGE_OPENJDK7),)
-TARGETS:=fastjar gcj ecj jikes classpath jamvm ant openjdk7
-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/ant/Makefile b/jtools/ant/Makefile
deleted file mode 100644
index 1741ed703..000000000
--- a/jtools/ant/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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_SITES:= http://archive.apache.org/dist/ant/source/
-
-DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
-WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ant
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
- cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar
- cp $(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional
- cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \
- LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
- JAVA_HOME=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm ; \
- $(BASH) build.sh
- touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/ant: $(WRKBUILD)/.compiled
- cd $(WRKBUILD)/dist; \
- $(CP) bin/* $(STAGING_JAVA_HOST_DIR)/usr/bin ; \
- $(CP) lib/* $(STAGING_JAVA_HOST_DIR)/usr/lib
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/ant/junit-4.9b2.jar b/jtools/ant/junit-4.9b2.jar
deleted file mode 100644
index aec30a07f..000000000
--- a/jtools/ant/junit-4.9b2.jar
+++ /dev/null
Binary files differ
diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
deleted file mode 100644
index 06f59e1a0..000000000
--- a/jtools/classpath/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-
-CPENV:= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
- PATH=${STAGING_JAVA_HOST_DIR}/usr/bin:$$PATH \
- CLASSPATH=${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
- (cd $(WRKBUILD); env $(CPENV) ./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-gjdoc \
- --with-jar=no \
- --disable-Werror)
- touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
- env $(CPENV) ${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
deleted file mode 100644
index 2154bedce..000000000
--- a/jtools/ecj/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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:= 2
-PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
- env \
- DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
- LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
- PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
- $(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \
- -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \
- --main=org.eclipse.jdt.internal.compiler.batch.Main \
- $(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/ecj.jar
- echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \
- ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
- chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
- # put a wrapper for java here
- mv ${STAGING_JAVA_HOST_DIR}/usr/bin/gij ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native
- echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
- ${STAGING_JAVA_HOST_DIR}/usr/bin/java
- chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java
- echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
- ${STAGING_JAVA_HOST_DIR}/usr/bin/gij
- chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/gij
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/fastjar/Makefile b/jtools/fastjar/Makefile
deleted file mode 100644
index 744776eac..000000000
--- a/jtools/fastjar/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/files.needed b/jtools/files.needed
deleted file mode 100644
index c6a1de4ba..000000000
--- a/jtools/files.needed
+++ /dev/null
@@ -1,11 +0,0 @@
-cups.h;libcups
-jpeglib.h;libjpeg
-gif_lib.h;libgif
-png.h;libpng
-Xtos.h;libXt
-Xinerama.h;libXinerama
-Xrender.h;libXrender
-XTest.h;libXtst
-freetype.h;freetype
-asoundlib.h;libasound
-ffi.h;libffi
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
deleted file mode 100644
index 1775ff5aa..000000000
--- a/jtools/jamvm/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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:= 2
-PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/}
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
- cd $(WRKBUILD); env \
- CC='${CC_FOR_BUILD}' \
- CXX='${CXX_FOR_BUILD}' \
- ./configure \
- --prefix=$(STAGING_JAVA_HOST_DIR)/usr \
- --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr
- touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
- ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
- touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
- ${MAKE} -C ${WRKBUILD} install $(MAKE_TRACE)
- ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java
- ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile
deleted file mode 100644
index 1d619c8eb..000000000
--- a/jtools/jikes/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
-
-DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes
-
-$(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/jikes: $(WRKBUILD)/.compiled
- ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
- $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/javac
- $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/javac
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/openjdk7/Makefile b/jtools/openjdk7/Makefile
deleted file mode 100644
index 58db553fe..000000000
--- a/jtools/openjdk7/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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:= icedtea
-PKG_VERSION:= 2.3.12
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11
-PKG_DESCR:= OpenJDK 7 Java VM
-PKG_SECTION:= lang
-PKG_URL:= http://openjdk.org/
-PKG_SITES:= http://icedtea.classpath.org/download/source/
-
-include ../rules.mk
-
-OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar"
-OPENJDK_NATIVE_ENV+= DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj PATH=$$PATH:$(STAGING_JAVA_HOST_DIR)/usr/bin
-OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip"
-
-install: ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java
-
-CONFIGURE_ARGS+=\
- --enable-bootstrap \
- --enable-zero \
- --with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
- --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \
- --with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
- --with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar \
- --without-hotspot-build \
- --disable-system-kerberos \
- --disable-system-jpeg \
- --disable-system-lcms \
- --disable-system-zlib \
- --disable-system-png \
- --disable-system-gif \
- --disable-system-gtk \
- --disable-system-gio \
- --disable-system-fontconfig \
- --disable-compile-against-syscalls \
- --without-rhino \
- --disable-docs
-
-$(WRKDIST)/.configured: ${WRKDIST}/.prepared
- (cd ${WRKBUILD}; export ${OPENJDK_NATIVE_ENV}; ./configure ${CONFIGURE_ARGS})
- touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
- export ${OPENJDK_NATIVE_ENV}; $(MAKE) -C $(WRKBUILD) icedtea-boot
- touch $@
-
-${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java: $(WRKBUILD)/.compiled
- $(CP) $(WRKSRC)/openjdk.build-boot/j2sdk-image $(STAGING_JAVA_HOST_DIR)/bootstrap-jdk
- touch $@
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/jtools/openjdk7/patches/openadk.patch b/jtools/openjdk7/patches/openadk.patch
deleted file mode 100644
index 11eb2aea6..000000000
--- a/jtools/openjdk7/patches/openadk.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur icedtea-2.3.4.orig/Makefile.in icedtea-2.3.4/Makefile.in
---- icedtea-2.3.4.orig/Makefile.in 2013-01-15 10:44:02.000000000 +0100
-+++ icedtea-2.3.4/Makefile.in 2013-02-11 17:32:45.000000000 +0100
-@@ -640,7 +640,7 @@
- $(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
-
- # Bootstrapping patches
--ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
-+ICEDTEA_BOOT_PATCHES = patches/topdir-openwrt.patch patches/boot/javafiles.patch \
- patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
- patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
- patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \
-@@ -2033,7 +2033,7 @@
- # Optional native ecj
- stamps/native-ecj.stamp:
- mkdir -p stamps
--@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-+@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} -lgcj $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- @BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
- touch $@
-
-diff -Nur icedtea-2.3.4.orig/patches/topdir-openwrt.patch icedtea-2.3.4/patches/topdir-openwrt.patch
---- icedtea-2.3.4.orig/patches/topdir-openwrt.patch 1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.3.4/patches/topdir-openwrt.patch 2013-02-12 09:37:29.000000000 +0100
-@@ -0,0 +1,14 @@
-+diff -Nur openjdk-boot.orig/Makefile icedtea7-forest-2-3-8bd8e70d4a03.2/Makefile
-+--- openjdk-boot.orig/Makefile 2013-01-14 23:24:55.000000000 +0100
-++++ openjdk-boot/Makefile 2013-02-11 17:28:22.000000000 +0100
-+@@ -53,9 +53,7 @@
-+ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
-+ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
-+
-+-ifndef TOPDIR
-+- TOPDIR:=.
-+-endif
-++TOPDIR:=.
-+
-+ ifndef JDK_TOPDIR
-+ JDK_TOPDIR=$(TOPDIR)/jdk
diff --git a/jtools/prereq.sh b/jtools/prereq.sh
deleted file mode 100644
index 2604de1ab..000000000
--- a/jtools/prereq.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-# test for existing /usr/include/asm
-if [ ! -d "/usr/include/asm" ]; then
- echo "ERROR: directory \"/usr/include/asm\" not found."
- echo "on some systems this is name asm-generic."
- echo "try to create a link to the asm directory with"
- echo "\"ln -s /usr/include/asm-generic /usr/include/asm\""
- exit 1
-fi
-
-# test if all files from the files.needed file are available
-for LINE in `cat files.needed`; do
-
- FILE=`echo ${LINE} | awk -F ";" '{print $1}'`
- LIB=`echo ${LINE} | awk -F ";" '{print $2}'`
-
- #echo -n "looking for development files of \"${LIB}\"..."
- FOUND=`find /usr/include /usr/lib -name "${FILE}" | wc -l`
- if [ ${FOUND} -lt 1 ]; then
- echo "not found!";
- echo "Please install the development header files for the library \"${LIB}\"."
- exit 1
- fi
-
-done
diff --git a/jtools/qemu/Makefile b/jtools/qemu/Makefile
deleted file mode 100644
index b6add732e..000000000
--- a/jtools/qemu/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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:= qemu
-PKG_VERSION:= 0.14.1
-PKG_RELEASE:= 1
-PKG_MD5SUM:= b6c713a8db638e173af53a62d5178640
-PKG_SITES:= http://download.savannah.gnu.org/releases/qemu/
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
- (cd $(WRKBUILD); ./configure --prefix=/usr \
- --host-cc=$(CC_FOR_BUILD) \
- --disable-system \
- --disable-sdl \
- --target-list=arm-linux-user,i386-linux-user,mipsel-linux-user,x86_64-linux-user \
- )
- touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
- ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
- touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm: $(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
deleted file mode 100644
index 689d211a0..000000000
--- a/jtools/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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}
-GCJ_VER:= 4.7.3
-
-include ${TOPDIR}/mk/buildhlp.mk
diff --git a/mk/build.mk b/mk/build.mk
index 986d66cd7..5286212ce 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -26,7 +26,6 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_PACKAGE_PACEMAKER=n \
ADK_PACKAGE_PACEMAKER_MGMTD=n \
ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \
- ADK_PACKAGE_OPENJDK7=n \
ADK_PACKAGE_CLASSPATH=n \
ADK_PACKAGE_GRUB=n \
ADK_PACKAGE_CRYPTINIT=n \
@@ -152,12 +151,12 @@ ifeq ($(ADK_NATIVE),y)
else
ifeq ($(ADK_TOOLCHAIN),y)
ifeq ($(ADK_TOOLCHAIN_ONLY),y)
- $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile
+ $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile
else
- $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile root_clean package/install
+ $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile root_clean package/install
endif
else
- $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
+ $(MAKE) -f mk/build.mk toolchain/fixup tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
endif
endif
@@ -189,9 +188,6 @@ toolchain/%: ${STAGING_DIR}
tools/%:
$(MAKE) -C tools $(patsubst tools/%,%,$@)
-jtools/%:
- $(MAKE) -C jtools $(patsubst jtools/%,%,$@)
-
image:
$(MAKE) -C target image
@@ -272,7 +268,7 @@ cleandir:
rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
- rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(JTOOLS_BUILD_DIR) $(STAGING_JAVA_HOST_DIR)
+ rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
cleantarget:
@@ -286,9 +282,9 @@ distclean:
@$(TRACE) distclean
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
- ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
+ ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
- @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
+ @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
.menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.*
@@ -534,9 +530,9 @@ _mconfig2: ${CONFIG}/conf modconfig .menu
distclean:
@$(MAKE) -C $(CONFIG) clean
@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
- ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
+ ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR)
- @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
+ @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
.menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG
diff --git a/mk/vars.mk b/mk/vars.mk
index 657d44ae5..fcd22a5e6 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,7 +18,6 @@ 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_SUFFIX}_${ADK_TARGET_LIBC}
STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_*
-STAGING_JAVA_HOST_DIR:= ${BASE_DIR}/jhost
# use headers and foo-config from system
ifeq ($(ADK_NATIVE),y)
STAGING_TARGET_DIR:=
@@ -35,7 +34,6 @@ STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LI
TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${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}
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/jtools/classpath/patches/classpath-fix.patch b/package/classpath/patches/classpath-fix.patch
index e03eb2342..e03eb2342 100644
--- a/jtools/classpath/patches/classpath-fix.patch
+++ b/package/classpath/patches/classpath-fix.patch
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/jtools/gcj/Makefile b/package/gcj/Makefile
index 3af5e0e5f..f7669a740 100644
--- a/jtools/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -4,24 +4,25 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= gcj
-PKG_RELEASE:= 1
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 ../rules.mk
-GCJ_ENV+= "JAR=no LDFLAGS=-liconv"
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
+$(eval $(call HOST_template,GCJ,gcj,$(PKG_VERSION)-${PKG_RELEASE}))
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
- (cd $(WRKBUILD); \
- wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar; \
- env ${GCJ_ENV} ./configure \
- --prefix=/usr \
+HOST_STYLE:= auto
+HOST_MAKE_ENV+= "JAR=no LDFLAGS=-liconv"
+HOST_CONFIGURE_ARGS:= \
--enable-java-home \
--enable-languages=java \
--enable-shared \
@@ -36,17 +37,11 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
--disable-biarch \
--disable-decimal-float \
--disable-multilib \
- --disable-bootstrap \
- );
- touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
- env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
- touch $@
+ --disable-bootstrap
-${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled
- $(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR}
- env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} \
- DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+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/tools.mk
+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,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
include $(TOPDIR)/mk/python.mk
+HOST_STYLE:= auto
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ENV+= PYTHON=$(PYTHON)
@@ -26,4 +31,5 @@ libxcb-install:
${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib
${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index ed4fc21b4..292ae8553 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -10,6 +10,10 @@ PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11
PKG_DESCR:= OpenJDK 7 Java VM
PKG_SECTION:= lang
PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host
+PKG_BUILDDEP+= fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host
+PKG_BUILDDEP+= xineramaproto-host libXinerama-host libXtst-host freetype-host
+PKG_BUILDDEP+= alsa-lib-host libffi-host gcj-host ecj-host jikes-host
+PKG_BUILDDEP+= classpath-host jamvm-host ant-host openjdk7-host
PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc
@@ -19,6 +23,8 @@ PKG_SITES:= http://icedtea.classpath.org/download/source/
DISTFILES:= icedtea-$(PKG_VERSION).tar.gz
WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION}
+GCJ_VER:= 4.7.3
+
PKG_HOST_DEPENDS:= linux
PKG_ARCH_DEPENDS:= arm mips ppc sparc x86 x86_64
PKG_SYSTEM_DEPENDS:= !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong
@@ -30,9 +36,11 @@ PKGCD_SHARK:= Shark JIT backend (needs eglibc/glibc)
PKGCB_SHARK:= llvm
PKGCD_CACAO:= Cacao JIT backend
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
include $(TOPDIR)/mk/qemu.mk
+$(eval $(call HOST_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# for UINTPTR_MAX in stdint.h
@@ -41,7 +49,7 @@ TARGET_CFLAGS+= -D__STDC_LIMIT_MACROS
TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS))
TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS))
TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
-BOOTSTRAPJDK:= ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk
+BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk
JDKARCH:= $(CPU_ARCH)
ifeq ($(ARCH),x86)
@@ -70,12 +78,11 @@ CONFIGURE_COMMON:= --disable-docs \
--with-jar=$(BOOTSTRAPJDK)/bin/jar \
--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
- --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
+ --with-gcj=$(STAGING_HOST_DIR)/usr/bin/gcj \
--without-hotspot-build \
--disable-system-jpeg \
--disable-system-lcms \
--disable-system-zlib \
- --disable-system-kerberos \
--disable-system-png \
--disable-system-gif \
--disable-system-gtk \
@@ -88,17 +95,55 @@ CONFIGURE_ARGS+= $(CONFIGURE_BACKEND)
CONFIGURE_ARGS+= $(CONFIGURE_COMMON)
CONFIGURE_ARGS+= --disable-bootstrap
-CONFIGURE_ENV+= PATH="$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}"
+CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \
ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
- GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU)
+ OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \
+ GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) \
+ LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
ALL_TARGET:= icedtea
+# host stuff
+OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar"
+OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64
+OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj
+OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip"
+OPENJDK_NATIVE_ENV+= FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+
+HOST_STYLE:= auto
+HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV)
+HOST_MAKE_ENV+= $(OPENJDK_NATIVE_ENV)
+HOST_ALL_TARGET:= icedtea-boot
+
+HOST_CONFIGURE_ARGS+=\
+ --enable-bootstrap \
+ --enable-zero \
+ --with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \
+ --with-java=$(STAGING_HOST_DIR)/usr/bin/java \
+ --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \
+ --with-ecj-jar=${STAGING_HOST_DIR}/usr/share/java/ecj.jar \
+ --without-hotspot-build \
+ --disable-system-jpeg \
+ --disable-system-lcms \
+ --disable-system-zlib \
+ --disable-system-png \
+ --disable-system-gif \
+ --disable-system-gtk \
+ --disable-system-gio \
+ --disable-system-fontconfig \
+ --disable-compile-against-syscalls \
+ --without-rhino \
+ --disable-docs
+
+hostpost-install:
+ -rm -rf $(STAGING_HOST_DIR)/bootstrap-jdk
+ $(CP) $(WRKBUILD)/openjdk.build-boot/j2sdk-image $(STAGING_HOST_DIR)/bootstrap-jdk
+
openjdk7-install:
$(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/lib/jvm/jre
$(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/bin
@@ -107,4 +152,5 @@ openjdk7-install:
(cd $(IDIR_OPENJDK7)/usr/bin && ln -sf ../lib/jvm/jre/bin/java .)
(cd $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/$(JDKARCH) && ln -sf server/libjvm.so .)
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index effd32a92..75e291e47 100644
--- a/package/openjdk7/patches/openadk.patch
+++ b/package/openjdk7/patches/openadk.patch
@@ -1,6 +1,6 @@
-diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in
---- icedtea-2.3.11.orig/Makefile.in 2013-07-25 02:39:55.000000000 +0200
-+++ icedtea-2.3.11/Makefile.in 2013-12-08 15:43:27.000000000 +0100
+diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in
+--- icedtea-2.3.12.orig/Makefile.in 2013-07-26 20:18:01.000000000 +0200
++++ icedtea-2.3.12/Makefile.in 2014-01-16 08:54:53.000000000 +0100
@@ -695,7 +695,7 @@
$(DISTRIBUTION_PATCHES)
@@ -19,10 +19,10 @@ diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in
@BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
touch $@
-diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/openadk.patch
---- icedtea-2.3.11.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.3.11/patches/openadk.patch 2013-12-08 16:22:41.000000000 +0100
-@@ -0,0 +1,493 @@
+diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/openadk.patch
+--- icedtea-2.3.12.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100
++++ icedtea-2.3.12/patches/openadk.patch 2014-01-16 08:55:05.000000000 +0100
+@@ -0,0 +1,546 @@
+diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-07-17 20:14:46.000000000 +0200
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-12-08 15:44:03.000000000 +0100
@@ -516,3 +516,56 @@ diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/opena
+
+ ifndef JDK_TOPDIR
+ JDK_TOPDIR=$(TOPDIR)/jdk
++diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make
++--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make 2013-07-26 12:31:42.000000000 +0200
+++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make 2014-01-14 21:28:27.000000000 +0100
++@@ -285,7 +285,7 @@
++ LIBS_VM += $(LIBS)
++ endif
++ ifeq ($(ZERO_BUILD), true)
++- LIBS_VM += $(LIBFFI_LIBS)
+++ LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
++ endif
++ ifeq ($(SHARK_BUILD), true)
++ LFLAGS_VM += $(LLVM_LDFLAGS)
++diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile
++--- openjdk-boot.orig/Makefile 2013-07-24 23:26:43.000000000 +0200
+++++ openjdk-boot/Makefile 2014-01-13 22:15:04.000000000 +0100
++@@ -53,9 +53,7 @@
++ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
++ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
++
++-ifndef TOPDIR
++- TOPDIR:=.
++-endif
+++TOPDIR:=.
++
++ ifndef JDK_TOPDIR
++ JDK_TOPDIR=$(TOPDIR)/jdk
++diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
++--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2013-07-26 12:31:42.000000000 +0200
+++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2014-01-16 08:45:53.000000000 +0100
++@@ -38,7 +38,7 @@
++
++ offsets_arm.s: mkoffsets
++ @echo Generating assembler offsets
++- ./mkoffsets > $@
+++ $(QEMU) ./mkoffsets > $@
++
++ bytecodes_arm.s: bytecodes_arm.def mkbc
++ @echo Generating ARM assembler bytecode sequences
++@@ -46,12 +46,12 @@
++
++ mkbc: $(GAMMADIR)/tools/mkbc.c
++ @echo Compiling mkbc tool
++- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
+++ $(CC_FOR_BUILD) -o $@ $< $(COMPILE_DONE)
++
++ mkoffsets: asm_helper.cpp
++ @echo Compiling offset generator
++ $(QUIETLY) $(REMOVE_TARGET)
++- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
+++ $(CC_COMPILE) $(CFLAGS) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
++
++ endif
++
diff --git a/package/recordproto/Makefile b/package/recordproto/Makefile
index e9d7f6894..52f517715 100644
--- a/package/recordproto/Makefile
+++ b/package/recordproto/Makefile
@@ -8,12 +8,18 @@ PKG_VERSION:= 1.14.2
PKG_RELEASE:= 1
PKG_DESCR:= RECORD extension headers
PKG_SECTION:= devel
+PKG_BUILDDEP:= recordproto-host
PKG_MD5SUM:= 868235e1e150e68916d5a316ebc4ccc4
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,RECORDPROTO,recordproto,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,RECORDPROTO,recordproto,$(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/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 26561b546..eca8ab4f5 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -9,26 +9,29 @@ PKG_RELEASE:= 1
PKG_DESCR:= XML-XCB protocol descriptions
PKG_SECTION:= devel
PKG_MD5SUM:= 8d2cdb770129cef563088a90c5bec768
-PKG_BUILDDEP:= autotool bzip2-host python2-host
+PKG_BUILDDEP:= autotool bzip2-host python2-host xcb-proto-host
PKG_SITES:= http://xcb.freedesktop.org/dist/
PKG_OPTS:= dev devonly
PKG_SUBPKGS:= XCB_PROTO XCB_PYTHON
PKGSC_XCB_PYTHON:= x11/misc
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_XCB_PYTHON}))
include $(TOPDIR)/mk/python.mk
+HOST_STYLE:= auto
CONFIGURE_ENV+= PYTHON=$(PYTHON)
CONFIGURE_ARGS+= --datadir=${STAGING_DIR}/usr/share
post-build:
- ${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb
- ${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb
+ ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb
+ ${CP} ${WRKBUILD}/src/*.xml ${STAGING_TARGET_DIR}/usr/share/xcb
xcb-python-install:
$(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
@@ -38,4 +41,5 @@ xcb-python-install:
${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \
${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile
index 22173200d..1c70d3956 100644
--- a/package/xextproto/Makefile
+++ b/package/xextproto/Makefile
@@ -8,12 +8,18 @@ PKG_VERSION:= 7.2.1
PKG_RELEASE:= 1
PKG_DESCR:= X Protocol Extensions headers
PKG_SECTION:= devel
+PKG_BUILDDEP:= xextproto-host
PKG_MD5SUM:= 9062d689f422fad1b8774c967d730f09
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,XEXTPROTO,xextproto,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,XEXTPROTO,xextproto,$(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/xineramaproto/Makefile b/package/xineramaproto/Makefile
index 6454275b9..206da8936 100644
--- a/package/xineramaproto/Makefile
+++ b/package/xineramaproto/Makefile
@@ -8,12 +8,18 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_DESCR:= Xinerama Extension headers
PKG_SECTION:= devel
+PKG_BUILDDEP:= xineramaproto-host
PKG_MD5SUM:= e0e148b11739e144a546b8a051b17dde
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,XINERAMAPROTO,xineramaproto,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,XINERAMAPROTO,xineramaproto,$(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/xtrans/Makefile b/package/xtrans/Makefile
index c19ad33b2..fbbd16857 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -8,14 +8,20 @@ PKG_VERSION:= 1.2.6
PKG_RELEASE:= 1
PKG_DESCR:= X11 network protocol transport library
PKG_SECTION:= devel
+PKG_BUILDDEP:= xtrans-host
PKG_MD5SUM:= b91dd22b77a350d129a81175cd8c58cc
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,XTRANS,xtrans,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+HOST_STYLE:= auto
+HOST_CONFIGURE_ARGS+= --datadir=$(STAGING_HOST_DIR)/usr/lib
CONFIGURE_ARGS+= --datadir=/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index c94d01138..79d416569 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -61,21 +61,6 @@ if [[ -n $ADK_NATIVE ]];then
fi
fi
-if [[ -n $ADK_COMPILE_OPENJDK ]]; then
- NEED_GXX="$NEED_GXX openjdk"
- NEED_XSLTPROC="$NEED_XSLTPROC openjdk"
-fi
-
-if [[ -n $ADK_COMPILE_OPENJDK ]]; then
- cd ${TOPDIR}/jtools; bash prereq.sh
- [ $? -ne 0 ] && out=1
-fi
-
-if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
- cd ${TOPDIR}/jtools; bash prereq.sh
- [ $? -ne 0 ] && out=1
-fi
-
if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
fi