summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-05-06 00:03:58 -0500
committerMax Rees <maxcrees@me.com>2020-05-06 00:04:22 -0500
commit8907c7de87fa709a23ee19e11bd3d5ef6f1f13b3 (patch)
tree0bb00b8285325a5c313ce34f82b0fdc106bdab82
parent28fdd34de44edcf8d1a08cc45cd564099e9268fc (diff)
downloadpackages-8907c7de87fa709a23ee19e11bd3d5ef6f1f13b3.tar.gz
packages-8907c7de87fa709a23ee19e11bd3d5ef6f1f13b3.tar.bz2
packages-8907c7de87fa709a23ee19e11bd3d5ef6f1f13b3.tar.xz
packages-8907c7de87fa709a23ee19e11bd3d5ef6f1f13b3.zip
*/openjdk*: +provides=$pkgname-bootstrap
-rw-r--r--legacy/openjdk7/APKBUILD4
-rw-r--r--user/openjdk8/APKBUILD4
2 files changed, 6 insertions, 2 deletions
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"