From 5067e239ec012034bedb6f709a9978cfa0afe519 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:25 -0400 Subject: [PATCH] openjdk12-bootstrap: fix version, xlint --- srcpkgs/openjdk12-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template index 4861ad1efc..2b5d421a52 100644 --- a/srcpkgs/openjdk12-bootstrap/template +++ b/srcpkgs/openjdk12-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk12-bootstrap' -_java_ver=12 -_java_min_ver=0 -_java_sec_ver=2 -_jdk_update=10 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk12-bootstrap -version="${_base_version}+${_jdk_update}" +version=12.0.2+10 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${version}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib @@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 12)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="https://openjdk.java.net" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb +provides="java-environment-${version}_1 java-runtime-${version}_1" lib32disabled=yes nocross=yes