mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
openjdk : Patch to extend valid currency change dates to 20 years.
This commit is contained in:
parent
e62cb5585d
commit
9b81769950
14
pkgs/development/compilers/openjdk/currency-date-range.patch
Normal file
14
pkgs/development/compilers/openjdk/currency-date-range.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -Naur openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
|
||||
--- openjdk-7u65-b32-upstream/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-07-17 05:42:14.000000000 -0430
|
||||
+++ openjdk-7u65-b32/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-12-30 10:15:50.327905933 -0430
|
||||
@@ -281,8 +281,8 @@
|
||||
checkCurrencyCode(newCurrency);
|
||||
String timeString = currencyInfo.substring(4, length - 4);
|
||||
long time = format.parse(timeString).getTime();
|
||||
- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
|
||||
- throw new RuntimeException("time is more than 10 years from present: " + time);
|
||||
+ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
|
||||
+ throw new RuntimeException("time is more than 20 years from present: " + time);
|
||||
}
|
||||
specialCaseCutOverTimes[specialCaseCount] = time;
|
||||
specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
|
@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
|
||||
./fix-java-home.patch
|
||||
./paxctl.patch
|
||||
./read-truststore-from-env.patch
|
||||
./currency-date-range.patch
|
||||
];
|
||||
|
||||
NIX_NO_SELF_RPATH = true;
|
||||
|
Loading…
Reference in New Issue
Block a user