summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/icedtea/files/6.1.9.6-sparc.patch')
-rw-r--r--dev-java/icedtea/files/6.1.9.6-sparc.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/dev-java/icedtea/files/6.1.9.6-sparc.patch b/dev-java/icedtea/files/6.1.9.6-sparc.patch
new file mode 100644
index 000000000000..ea41ad005ab1
--- /dev/null
+++ b/dev-java/icedtea/files/6.1.9.6-sparc.patch
@@ -0,0 +1,29 @@
+diff -Nru icedtea6-1.9.6.orig/Makefile.am icedtea6-1.9.6/Makefile.am
+--- icedtea6-1.9.6.orig/Makefile.am 2011-02-09 10:48:29.464832314 +0000
++++ icedtea6-1.9.6/Makefile.am 2011-02-09 13:01:39.430490143 +0000
+@@ -327,7 +327,8 @@
+ patches/openjdk/6795356-proxylazyvalue-leak.patch \
+ patches/openjdk/6687968-pngimagereader_mem_leak.patch \
+ patches/openjdk/6541476-png-iTXt-chunk.patch \
+- patches/openjdk/6782079-png_metadata_oom.patch
++ patches/openjdk/6782079-png_metadata_oom.patch \
++ patches/g344659-sparc_fscanf_fix.patch
+
+ if WITH_ALT_HSBUILD
+ ICEDTEA_PATCHES += \
+diff -Nru icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch
+--- icedtea6-1.9.6.orig/patches/g344659-sparc_fscanf_fix.patch 1970-01-01 01:00:00.000000000 +0100
++++ icedtea6-1.9.6/patches/g344659-sparc_fscanf_fix.patch 2011-02-09 13:01:39.430490143 +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;
++ }