wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

openjdk9-bootstrap: fix build

Browse source 
hg.openjdk.java.net is gone

not an update, but reset revision because changing versioning (p -> +)
xbps-uhelper confirms this is an increasing version change.
This commit is contained in:
classabbyamp 2024-05-29 20:57:11 -04:00
parent 80eef2088e
commit 15a55fa862
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
2 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
srcpkgs/openjdk9-bootstrap/patches/future.patch Normal file
View file

@ -0,0 +1,15 @@
fixes build failure
--- a/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
+++ b/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
@@ -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) 50) * 365 * 24 * 60 * 60 * 1000) {
+ throw new RuntimeException("time is more than 50 years from present: " + time);
}
specialCaseCutOverTimes[specialCaseCount] = time;
specialCaseOldCurrencies[specialCaseCount] = oldCurrency;

31
srcpkgs/openjdk9-bootstrap/template
View file

@ -1,11 +1,9 @@
# Template file for 'openjdk9-bootstrap' # Template file for 'openjdk9-bootstrap'
_final_jdk_home="usr/lib/jvm/java-9-openjdk" _final_jdk_home="usr/lib/jvm/java-9-openjdk"
pkgname=openjdk9-bootstrap pkgname=openjdk9-bootstrap
version=9.0.4p12 version=9.0.4+12
revision=3 revision=1
_repo_ver=${version/p/+}
archs="x86_64* i686* aarch64* arm* ppc64*" archs="x86_64* i686* aarch64* arm* ppc64*"
create_wrksrc=yes
build_style=gnu-configure build_style=gnu-configure
configure_args=" configure_args="
--prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@ -32,25 +30,10 @@ short_desc="OpenJDK Java Development Kit (bootstrap version 9)"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only WITH Classpath-exception-2.0" license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="http://openjdk.java.net/" homepage="http://openjdk.java.net/"
distfiles=" distfiles="https://github.com/openjdk/jdk9u/archive/refs/tags/jdk-${version}.tar.gz"
http://hg.openjdk.java.net/jdk-updates/jdk9u/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-root.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/corba/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-corba.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/hotspot/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-hotspot.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/jaxp/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jaxp.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/jaxws/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jaxws.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
repository=bootstrap repository=bootstrap
checksum="c27ceccaa9461bebb385739ecb016f275a8a293551db81ad9a0a68be0441b9a4 checksum=635870b51fbe8300bdcc5eb1ac5100aed06756f1d2112d3e83a298b89dce3ed2
b20aedbda5ccb81e3261343ba9cce1b9a8f5f50b283469a2093db312502edd84
a6fe7dbec05cf0568a1584ef401e6ae4c3d06cedc5958b7b46ead42ec3339324
1a7a6674ac3a1b988886ce4e5b7c7ae640584a9d50e552e05df69e2a0f5ab551
09ae3324a4a93f5029f530bdee047687eadd7bf5fe6990b567116bef75b539d7
cf3f2d4a0f43f1f5622513402689d2ad5b74c76c3d12badc6e8db7558f722c8c
a1d8cafd40d5b26c09a32b8e14bc5cc79de95eb2876ea11881730b737a9f503b
2e5ab48bbf2bbf930488a38113710ce297cb6a08ac57df9b5b1af334161e8a77"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
ppc64*) ;; ppc64*) ;;
@ -79,11 +62,7 @@ fi
export CCACHE_DISABLE=1 export CCACHE_DISABLE=1
post_extract() { post_extract() {
mv jdk9u*/* .
chmod +x configure chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
mv ${subrepo}-jdk-${_repo_ver} ${subrepo}
done
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
rm -r hotspot/src/jdk.hotspot.agent rm -r hotspot/src/jdk.hotspot.agent
@ -139,7 +118,7 @@ post_install() {
rm -rf ${DESTDIR}/usr/lib/bin rm -rf ${DESTDIR}/usr/lib/bin
# unify the install prefix # unify the install prefix
mv ${DESTDIR}/usr/lib/jvm/openjdk-${version%p*} ${DESTDIR}/${_final_jdk_home} mv ${DESTDIR}/usr/lib/jvm/openjdk-${version%+*} ${DESTDIR}/${_final_jdk_home}
# big and unnecessary # big and unnecessary
rm -f ${DESTDIR}/${_final_jdk_home}/lib/src.zip rm -f ${DESTDIR}/${_final_jdk_home}/lib/src.zip