summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/java/classpath/classpath.mk7
-rw-r--r--target/Config.in.arch1
-rw-r--r--toolchain/kernel-headers/Config.in2
3 files changed, 6 insertions, 4 deletions
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index faa634143..71c18a045 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -3,7 +3,7 @@
# classpath 0.96.1
#
#############################################################
-CLASSPATH_VERSION = 0.97.1
+CLASSPATH_VERSION = 0.98
CLASSPATH_SOURCE = classpath-$(CLASSPATH_VERSION).tar.gz
CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
CLASSPATH_AUTORECONF = NO
@@ -51,9 +51,10 @@ CLASSPATH_CONF_OPT = \
--enable-static \
--disable-glibtest --enable-explicit-deps=no \
--disable-debug \
- --disable-gconf-peer --disable-examples --disable-plugin
+ --disable-gconf-peer --disable-examples --disable-plugin \
+ --disable-Werror
-CLASSPATH_DEPENDENCIES = uclibc host-pkgconfig libpng jpeg tiff
+CLASSPATH_DEPENDENCIES = uclibc host-pkgconfig libpng jpeg
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
CLASSPATH_DEPENDENCIES+= alsa-lib
diff --git a/target/Config.in.arch b/target/Config.in.arch
index 4a20e44ef..611210e87 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -465,6 +465,7 @@ config BR2_ARCH
default "i486" if BR2_x86_i486
default "i586" if BR2_x86_i586
default "i586" if BR2_x86_pentium_mmx
+ default "i586" if BR2_x86_geode
default "i686" if BR2_x86_i686
default "i686" if BR2_x86_pentium2
default "i686" if BR2_x86_pentium3
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 9fd090360..34836cb99 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -49,7 +49,7 @@ config BR2_KERNEL_HEADERS_RT
config BR2_DEFAULT_KERNEL_HEADERS
string
default "2.6.26.8" if BR2_KERNEL_HEADERS_2_6_26
- default "2.6.27.24" if BR2_KERNEL_HEADERS_2_6_27
+ default "2.6.27.25" if BR2_KERNEL_HEADERS_2_6_27
default "2.6.28.10" if BR2_KERNEL_HEADERS_2_6_28
default "2.6.29.4" if BR2_KERNEL_HEADERS_2_6_29
default "2.6.30" if BR2_KERNEL_HEADERS_2_6_30