mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-15 21:57:02 +02:00
openjdk7-bootstrap: fix build
This commit is contained in:
parent
b14637f02a
commit
a7b6788e73
2 changed files with 18 additions and 1 deletions
15
srcpkgs/openjdk7-bootstrap/files/openjdk.future.patch
Normal file
15
srcpkgs/openjdk7-bootstrap/files/openjdk.future.patch
Normal file
|
@ -0,0 +1,15 @@
|
|||
fixes build failure
|
||||
|
||||
--- jdk.orig/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
|
||||
+++ jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
|
||||
@@ -283,8 +283,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) 50) * 365 * 24 * 60 * 60 * 1000) {
|
||||
+ throw new RuntimeException("time is more than 50 years from present: " + time);
|
||||
}
|
||||
specialCaseCutOverTimes[specialCaseCount] = time;
|
||||
specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
|
|
@ -97,9 +97,10 @@ post_extract() {
|
|||
# distrib patches are relative to wrksrc
|
||||
for patch in $(cat ${FILESDIR}/dist_patches_${XBPS_TARGET_LIBC}.txt); do
|
||||
case "$patch" in
|
||||
icedtea-*.patch) cp ${FILESDIR}/$patch ${wrksrc}
|
||||
icedtea-*.patch) cp ${FILESDIR}/$patch ${wrksrc};;
|
||||
esac
|
||||
done
|
||||
cp ${FILESDIR}/openjdk.future.patch ${wrksrc}
|
||||
}
|
||||
|
||||
# we need to set up these vars for both configure and build
|
||||
|
@ -137,6 +138,7 @@ _setup_build_env() {
|
|||
done
|
||||
|
||||
export DISTRIBUTION_PATCHES="$_patches"
|
||||
export OPENJDK_PATCHES="openjdk.future.patch"
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
|
|
Loading…
Add table
Reference in a new issue