classpath-native 0.97.2: Removed automake <1.10 incompatible part from autotools...

 - added patch to fix bug in java.util.DecimalFormat
classpath-minimal 0.97.2: Dito.
classpath 0.97.2: Dito.

diff --git a/packages/classpath/classpath-0.97.2/autotools.patch b/packages/classpath/classpath-0.97.2/autotools.patch
index 3df65cf..e36e143 100644 (file)
--- a/packages/classpath/classpath-0.97.2/autotools.patch
+++ b/packages/classpath/classpath-0.97.2/autotools.patch
@@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac
  dnl -----------------------------------------------------------
  dnl Enable collections.jar (disabled by default)
  dnl -----------------------------------------------------------
-Index: classpath-0.97.2/Makefile.am
-===================================================================
---- classpath-0.97.2.orig/Makefile.am  2008-06-01 20:47:05.000000000 +0200
-+++ classpath-0.97.2/Makefile.am       2008-08-02 00:58:39.004023720 +0200
-@@ -5,7 +5,7 @@
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
- # Allow users to pass site-specific flags to autoreconf via an env var. 
--ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
- 
- native: lib
- 

diff --git a/packages/classpath/classpath-minimal-0.97.2/autotools.patch b/packages/classpath/classpath-minimal-0.97.2/autotools.patch
index 3df65cf..e36e143 100644 (file)
--- a/packages/classpath/classpath-minimal-0.97.2/autotools.patch
+++ b/packages/classpath/classpath-minimal-0.97.2/autotools.patch
@@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac
  dnl -----------------------------------------------------------
  dnl Enable collections.jar (disabled by default)
  dnl -----------------------------------------------------------
-Index: classpath-0.97.2/Makefile.am
-===================================================================
---- classpath-0.97.2.orig/Makefile.am  2008-06-01 20:47:05.000000000 +0200
-+++ classpath-0.97.2/Makefile.am       2008-08-02 00:58:39.004023720 +0200
-@@ -5,7 +5,7 @@
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
- # Allow users to pass site-specific flags to autoreconf via an env var. 
--ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
- 
- native: lib
- 

diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb
index 5e6d532..8a87d1f 100644 (file)
--- a/packages/classpath/classpath-minimal_0.97.2.bb
+++ b/packages/classpath/classpath-minimal_0.97.2.bb
@@ -6,9 +6,10 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
   "
 
-PR = "r1"
+PR = "r2"
 
 PROVIDES = "${PN} classpath"
 

diff --git a/packages/classpath/classpath-native-0.97.2/autotools.patch b/packages/classpath/classpath-native-0.97.2/autotools.patch
index 3df65cf..e36e143 100644 (file)
--- a/packages/classpath/classpath-native-0.97.2/autotools.patch
+++ b/packages/classpath/classpath-native-0.97.2/autotools.patch
@@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac
  dnl -----------------------------------------------------------
  dnl Enable collections.jar (disabled by default)
  dnl -----------------------------------------------------------
-Index: classpath-0.97.2/Makefile.am
-===================================================================
---- classpath-0.97.2.orig/Makefile.am  2008-06-01 20:47:05.000000000 +0200
-+++ classpath-0.97.2/Makefile.am       2008-08-02 00:58:39.004023720 +0200
-@@ -5,7 +5,7 @@
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
- # Allow users to pass site-specific flags to autoreconf via an env var. 
--ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
- 
- native: lib
- 

diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb
index c9a2394..499ad9f 100644 (file)
--- a/packages/classpath/classpath-native_0.97.2.bb
+++ b/packages/classpath/classpath-native_0.97.2.bb
@@ -1,6 +1,6 @@
 require classpath-native.inc
 
-PR = "r1"
+PR = "r2"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
@@ -12,5 +12,6 @@ SRC_URI += "\
   file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
   "
 

diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb
index 1393e2c..5267222 100644 (file)
--- a/packages/classpath/classpath_0.97.2.bb
+++ b/packages/classpath/classpath_0.97.2.bb
@@ -6,9 +6,10 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
   "
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "gtk+ gconf libxtst"
 

diff --git a/packages/classpath/files/autotools.patch b/packages/classpath/files/autotools.patch
index baae366..663c034 100644 (file)
--- a/packages/classpath/files/autotools.patch
+++ b/packages/classpath/files/autotools.patch
@@ -22,16 +22,3 @@ Index: classpath-0.93/configure.ac
  
  # Handle -Werror default case.
  if test "$ENABLE_WERROR" = default; then
-Index: classpath-0.93/Makefile.am
-===================================================================
---- classpath-0.93.orig/Makefile.am    2006-02-08 08:35:30.000000000 +0100
-+++ classpath-0.93/Makefile.am 2008-08-24 21:45:42.405241264 +0200
-@@ -4,7 +4,7 @@
- SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS = -I m4 --install
- 
- native: lib
-