summaryrefslogtreecommitdiff
path: root/package/openjdk7/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-02 08:33:06 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-02 08:34:53 +0200
commitd07065b1441e770433c371efb93f8c3a2ef58b0e (patch)
tree8c50a41e458ebbe51b7fa11e7a31bd2a17b7c074 /package/openjdk7/Makefile
parent09989675149f4aa81d32812973bbb0ca48ed9ba9 (diff)
update to latest upstream
Diffstat (limited to 'package/openjdk7/Makefile')
-rw-r--r--package/openjdk7/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 8376e715a..3101f53fa 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -4,26 +4,27 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= openjdk7
-PKG_VERSION:= 2.4.5
+PKG_VERSION:= 2.4.7
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6dcc544657ade213d01017354a6f9858
+PKG_MD5SUM:= f6b28633b9978fadc724247cfc264ff0
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 recordproto-host libXi-host libXtst-host freetype-host
PKG_BUILDDEP+= renderproto-host libXrender-host alsa-lib-host libffi-host gcj-host ecj-host jikes-host
-PKG_BUILDDEP+= classpath-host jamvm-host ant-host cups-host openjdk7-host nss
+PKG_BUILDDEP+= classpath-host jamvm-host openjdk7-host nss
PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
PKG_BUILDDEP+= libpng giflib gtk+ glib fontconfig
+HOST_BUILDDEP:= ant-host cups-host
PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc cups
PKG_DEPENDS+= libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo
PKG_DEPENDS+= libpng giflib libgtk glib fontconfig
PKG_URL:= http://openjdk.org/
PKG_SITES:= http://icedtea.classpath.org/download/source/
-DISTFILES:= icedtea-$(PKG_VERSION).tar.gz
+DISTFILES:= icedtea-$(PKG_VERSION).tar.xz
WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION}
GCJ_VER:= 4.8.2
@@ -88,7 +89,7 @@ CONFIGURE_ARGS+= $(CONFIGURE_COMMON)
CONFIGURE_ARGS+= --disable-bootstrap
CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
-MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \
+MAKE_ENV+= ALT_COMPILER_PATH=$(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin \
ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \
ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
@@ -122,7 +123,7 @@ HOST_CONFIGURE_ARGS+=\
--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 \
+ --with-ecj-jar=${DL_DIR}/ecj.jar \
--without-hotspot-build \
--disable-system-zlib \
--disable-system-jpeg \