From bd6b49f697174dbc394fb6bde5fdd0a2f46072a2 Mon Sep 17 00:00:00 2001
From: John Voltz <john.voltz@gmail.com>
Date: Thu, 24 Apr 2008 16:48:20 +0000
Subject: bump to 0.97.1, removed patch as it has been already applied in
 upstream revision 0.97.0
 (http://gcc.gnu.org/bugzilla/buglist.cgi?product=classpath&target_milestone=0.97)
 also fix change in package path that prevented patches from being applied

---
 .../classpath/classpath-avr32-endianness.patch     | 29 ----------------------
 package/java/classpath/classpath.mk                |  7 +++---
 2 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 package/java/classpath/classpath-avr32-endianness.patch

(limited to 'package/java/classpath')

diff --git a/package/java/classpath/classpath-avr32-endianness.patch b/package/java/classpath/classpath-avr32-endianness.patch
deleted file mode 100644
index 2bb25dda5..000000000
--- a/package/java/classpath/classpath-avr32-endianness.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -rup ../classpath-0.96.1.default/ChangeLog ./ChangeLog
---- ../classpath-0.96.1.default/ChangeLog       2007-10-16 17:35:33.000000000
-+0200
-+++ ./ChangeLog 2007-12-18 09:36:39.000000000 +0100
-@@ -1,3 +1,7 @@
-+2007-12-18  Leen Toelen  <toelen@gmail.com>
-+
-+       * native/fdlibm/ieeefp.h: Added avr32 support
-+
- 2007-10-16  Mark Wielaard  <mark@klomp.org>
-
-        * NEWS: Mention small compile/configure/build fixes.
-diff -rup ../classpath-0.96.1.default/native/fdlibm/ieeefp.h
-./native/fdlibm/ieeefp.h
---- ../classpath-0.96.1.default/native/fdlibm/ieeefp.h  2006-04-19
-19:55:13.000000000 +0200
-+++ ./native/fdlibm/ieeefp.h    2007-12-18 09:32:55.000000000 +0100
-@@ -87,6 +87,10 @@
- #define __IEEE_LITTLE_ENDIAN
- #endif
-
-+#ifdef __AVR32__
-+#define __IEEE_BIG_ENDIAN
-+#endif
-+
- #ifdef __MIPSEL__
- #define __IEEE_LITTLE_ENDIAN
- #endif
-
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index dfb69bea5..cd9cc3565 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -3,14 +3,15 @@
 # classpath 0.96.1
 #
 #############################################################
-CLASSPATH_VERSION = 0.96.1
+CLASSPATH_VERSION = 0.97.1
 CLASSPATH_SOURCE = classpath-$(CLASSPATH_VERSION).tar.gz
 CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
 CLASSPATH_AUTORECONF = NO
 CLASSPATH_INSTALL_STAGING = YES
 CLASSPATH_INSTALL_TARGET = YES
 CLASSPATH_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install 
-CLASSPATH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install 
+CLASSPATH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+CLASSPATH_DIR_PREFIX = package/java
 
 CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \
@@ -91,4 +92,4 @@ endif
 
 
 
-$(eval $(call AUTOTARGETS,package,classpath))
+$(eval $(call AUTOTARGETS,package/java,classpath))
-- 
cgit v1.2.3