30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
|
diff -Nru icedtea6-1.9.3.old/Makefile.am icedtea6-1.9.3/Makefile.am
|
||
|
|
--- icedtea6-1.9.3.old/Makefile.am 2010-12-01 19:09:51.959606503 +0000
|
||
|
|
+++ icedtea6-1.9.3/Makefile.am 2010-12-07 12:51:29.306308677 +0000
|
||
|
|
@@ -317,7 +317,8 @@
|
||
|
|
patches/openjdk/6876282-bigdecimal_divide.patch \
|
||
|
|
patches/f14-fonts.patch \
|
||
|
|
patches/applet_hole.patch \
|
||
|
|
- patches/openjdk/7002666-eclipse_cdt_oops_crash.patch
|
||
|
|
+ patches/openjdk/7002666-eclipse_cdt_oops_crash.patch \
|
||
|
|
+ patches/g344659-sparc_fscanf_fix.patch
|
||
|
|
|
||
|
|
if WITH_ALT_HSBUILD
|
||
|
|
ICEDTEA_PATCHES += \
|
||
|
|
diff -Nru icedtea6-1.9.3.old/patches/g255873-sparc_fscanf_fix.patch icedtea6-1.9.3/patches/g255873-sparc_fscanf_fix.patch
|
||
|
|
--- icedtea6-1.9.3.old/patches/g344659-sparc_fscanf_fix.patch 1970-01-01 01:00:00.000000000 +0100
|
||
|
|
+++ icedtea6-1.9.3/patches/g344659-sparc_fscanf_fix.patch 2010-12-07 12:52:39.213034154 +0000
|
||
|
|
@@ -0,0 +1,12 @@
|
||
|
|
+diff -uNr openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp
|
||
|
|
+--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-06-21 22:12:15.000000000 +0100
|
||
|
|
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-11-29 20:15:36.179541001 +0000
|
||
|
|
+@@ -35,7 +35,7 @@
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ while (!feof(fp)) {
|
||
|
|
+- if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) {
|
||
|
|
++ if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu[0]) == 1) {
|
||
|
|
+ if (strstr(cpu, "Niagara") != NULL) {
|
||
|
|
+ rv = true;
|
||
|
|
+ }
|