From ae962e51a3800a9e95f135a6d09be7fe11b79f15 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 26 Apr 2015 06:40:24 -0500
Subject: update openjdk7 to latest, tested with x86/arm/mips/ppc

---
 package/openjdk7/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'package/openjdk7/Makefile')

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)
-- 
cgit v1.2.3