openjdk team mailing list archive

[Moritz Mühlenhoff <muehlenhoff@xxxxxxxxxxxxx>]

tags 775044 patch
thanks

> >From my pbuilder build log (on amd64):
> ...
> rm -f
> /tmp/buildd/openjdk-7-7u71-2.5.3/build/openjdk.build-boot/lib/currency.dat
> a /tmp/buildd/openjdk-7-7u71-2.5.3/build/bootstrap/jdk1.6.0/bin/java
> -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
> -Xmx512m -Xms512m -XX:PermSize=32m -XX:MaxPermSize=160m -jar
> /tmp/buildd/openjdk-7-7u71-2.5.3/build/openjdk.build-boot/btjars/generatec
> urrencydata.jar -o
> /tmp/buildd/openjdk-7-7u71-2.5.3/build/openjdk.build-boot/lib/currency.dat
> a.temp \ < ../../../src/share/classes/java/util/CurrencyData.properties
> Error: time is more than 10 years from present: 1104530400000
> java.lang.RuntimeException: time is more than 10 years from present:
> 1104530400000 at
> build.tools.generatecurrencydata.GenerateCurrencyData.makeSpecialCaseEntry
> (GenerateCurrencyData.java:285) at
> build.tools.generatecurrencydata.GenerateCurrencyData.buildMainAndSpecialC
> aseTables(GenerateCurrencyData.java:225) at
> build.tools.generatecurrencydata.GenerateCurrencyData.main(GenerateCurrenc
> yData.java:154) Makefile:345: recipe for target
> '/tmp/buildd/openjdk-7-7u71-2.5.3/build/openjdk.build-boot/lib/currency.da
> ta' failed make[6]: ***
> [/tmp/buildd/openjdk-7-7u71-2.5.3/build/openjdk.build-boot/lib/currency.da
> 
> (If I divide that number by 1000, it becomes Fri Dec 31 22:00:00 UTC 2004.
> So I'm not sure where the number comes from, but it appears to be off by a
> factor of 1000.)

Patch attached, this fixes the build for me.

For details please see https://bugs.gentoo.org/show_bug.cgi?id=534118

Cheers,
Moritz
-- 
Moritz Mühlenhoff
Open Source Software Engineer

Univention GmbH
be open.
Mary-Somerville-Str.1
28359 Bremen
Tel. : +49 421 22232-0 [.....]
Fax : +49 421 22232-99

muehlenhoff@xxxxxxxxxxxxx
http://www.univention.de

Geschäftsführer: Peter H. Ganten
HRB 20755 Amtsgericht Bremen
Steuer-Nr.: 71-597-02876 

https://bugs.gentoo.org/show_bug.cgi?id=534118

diff -Naur openjdk-7-7u71-2.5.3.orig/debian/patches/fix-2015-ftbfs.diff openjdk-7-7u71-2.5.3/debian/patches/fix-2015-ftbfs.diff
--- openjdk-7-7u71-2.5.3.orig/debian/patches/fix-2015-ftbfs.diff	1970-01-01 01:00:00.000000000 +0100
+++ openjdk-7-7u71-2.5.3/debian/patches/fix-2015-ftbfs.diff	2015-01-09 09:02:22.733531035 +0100
@@ -0,0 +1,13 @@
+diff -aur openjdk.orig/jdk/src/share/classes/java/util/CurrencyData.properties openjdk/jdk/src/share/classes/java/util/CurrencyData.properties
+--- openjdk.orig/jdk/src/share/classes/java/util/CurrencyData.properties	2014-10-02 04:17:19.000000000 +0200
++++ openjdk/jdk/src/share/classes/java/util/CurrencyData.properties	2015-01-09 08:48:47.732795575 +0100
+@@ -532,7 +532,7 @@
+ # TUNISIA
+ TN=TND
+ # TURKEY
+-TR=TRL;2004-12-31-22-00-00;TRY
++TR=TRY
+ # TURKMENISTAN
+ TM=TMT
+ # TURKS AND CAICOS ISLANDS
+Nur in openjdk/jdk/src/share/classes/java/util: CurrencyData.properties~.
diff -Naur openjdk-7-7u71-2.5.3.orig/debian/rules openjdk-7-7u71-2.5.3/debian/rules
--- openjdk-7-7u71-2.5.3.orig/debian/rules	2015-01-09 09:01:37.125040099 +0100
+++ openjdk-7-7u71-2.5.3/debian/rules	2015-01-09 08:59:58.983984499 +0100
@@ -418,6 +418,7 @@
 	debian/patches/default-jvm-cfg-$(hotspot_version).diff \
 	debian/patches/nonreparenting-wm.diff \
 	debian/patches/accessible-toolkit.patch \
+	debian/patches//fix-2015-ftbfs.diff \
 	debian/patches/fix_extra_flags-$(hotspot_version).diff \
 
 ifeq ($(with_bridge),atk)