From 13df4b4fac8068b1c833c4cff3c49feacc53b26e Mon Sep 17 00:00:00 2001 From: Max Rees Date: Mon, 4 May 2020 12:10:25 -0500 Subject: legacy/openjdk7: remove bashism --- legacy/openjdk7/APKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'legacy') diff --git a/legacy/openjdk7/APKBUILD b/legacy/openjdk7/APKBUILD index e87060a19..873b42508 100644 --- a/legacy/openjdk7/APKBUILD +++ b/legacy/openjdk7/APKBUILD @@ -25,6 +25,7 @@ install="" # upstream binary versions RHINO_VER=1.7.7.2 +_RHINO_VER=1_7_7_2 ANT_VER=1.9.11 case $CARCH in @@ -73,7 +74,7 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.g langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2 hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2 https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz - https://github.com/mozilla/rhino/releases/download/Rhino${RHINO_VER//./_}_Release/rhino-$RHINO_VER.zip + https://github.com/mozilla/rhino/releases/download/Rhino${_RHINO_VER}_Release/rhino-$RHINO_VER.zip icedtea-hotspot-musl.patch icedtea-hotspot-musl-ppc.patch -- cgit v1.2.3-70-g09d2 From 8907c7de87fa709a23ee19e11bd3d5ef6f1f13b3 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Wed, 6 May 2020 00:03:58 -0500 Subject: */openjdk*: +provides=$pkgname-bootstrap --- legacy/openjdk7/APKBUILD | 4 +++- user/openjdk8/APKBUILD | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'legacy') diff --git a/legacy/openjdk7/APKBUILD b/legacy/openjdk7/APKBUILD index 873b42508..b94d46452 100644 --- a/legacy/openjdk7/APKBUILD +++ b/legacy/openjdk7/APKBUILD @@ -51,6 +51,8 @@ _jrelib="$INSTALL_BASE/jre/lib/$_jarch" ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli" sonameprefix="$pkgname:" +provides="$pkgname-bootstrap=$pkgver-r$pkgrel" + subpackages="$pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase $pkgname-doc:doc" @@ -58,7 +60,7 @@ if [ "$BOOTSTRAP" != "no" ]; then makedepends="$makedepends java-gcj-compat" BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/ else - makedepends="$makedepends $pkgname fastjar" + makedepends="$makedepends $pkgname-bootstrap fastjar" BOOTSTRAP_JAVA_HOME="$INSTALL_BASE" fi diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index db3ccf6b1..313812683 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -13,7 +13,7 @@ license="GPL-2.0-only" depends="$pkgname-jre java-cacerts" makedepends="bash findutils libarchive-tools zip file util-linux libxslt autoconf automake linux-headers sed xz coreutils - ca-certificates libjpeg-turbo-dev cmd:which + $pkgname-bootstrap ca-certificates libjpeg-turbo-dev cmd:which nss-dev nss-static cups-dev giflib-dev libpng-dev libxt-dev lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev @@ -38,6 +38,8 @@ _jrelib="$_java_home/jre/lib/$_jarch" ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli" sonameprefix="$pkgname:" +provides="$pkgname-bootstrap=$pkgver-r$pkgrel" + subpackages="$pkgname-dbg $pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase $pkgname-doc $pkgname-demos" -- cgit v1.2.3-70-g09d2