summaryrefslogtreecommitdiff
path: root/package/openjdk7/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-04-26 06:40:24 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-04-26 06:40:38 -0500
commitae962e51a3800a9e95f135a6d09be7fe11b79f15 (patch)
tree66155f636e7219cebdb61dcfbe7c6df045950491 /package/openjdk7/Makefile
parenteaeb88f3f80b7f219b5812a23d78e2ced04b46ba (diff)
update openjdk7 to latest, tested with x86/arm/mips/ppc
Diffstat (limited to 'package/openjdk7/Makefile')
-rw-r--r--package/openjdk7/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 4bf2b4451..68c933c01 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= openjdk7
-PKG_VERSION:= 2.5.3
+PKG_VERSION:= 2.5.5
PKG_RELEASE:= 1
-PKG_HASH:= f4f2922cfec262496e935f81c1d39af66a789f69aa12d1ceee51bcca8934f1f0
+PKG_HASH:= 09e7aeb739a468dec8357f4b0757624b6c7ef38065fdf50323d369deac983dc7
PKG_DESCR:= java virtual machine
PKG_SECTION:= dev/lang
PKG_BUILDDEP:= openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
@@ -46,13 +46,14 @@ CONFIG_STYLE:= basic
# uclibc needs -liconv
ifeq ($(ADK_TARGET_LIB_UCLIBC)$(ADK_TARGET_LIB_UCLIBC_NG),y)
-TARGET_LIBS:= -liconv
+TARGET_LIBS:= -liconv -lm
endif
# for UINTPTR_MAX in stdint.h
TARGET_CFLAGS+= -D__STDC_LIMIT_MACROS
# segfaults with march=pentium-m/atom
TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS))
TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS))
+
BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk
JDKARCH:= $(ADK_TARGET_CPU_ARCH)