From dd537c96bd0de4f46d4b656c08377aed42543c2f Mon Sep 17 00:00:00 2001 From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org> Date: Fri, 13 Sep 2024 05:22:07 +0000 Subject: [PATCH] community/openjdk8-{corretto,loongarch}: add java-{cacerts,common} to makedepends when not cross-compiling this ensures that while bootstrapping a new Alpine stable release, when the builder starts complaining about not finding openjdk8-bootstrap, build order resolution would've caused these 2 makedepends to be built refs: cfafa406104d0ca9eae4218ac75a58ee677c1242 383a4f5179adee63a8f469a6fe66c4534fb4177d --- community/openjdk8-corretto/APKBUILD | 6 ++++++ community/openjdk8-loongarch/APKBUILD | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/community/openjdk8-corretto/APKBUILD b/community/openjdk8-corretto/APKBUILD index be14ad5ef60..ca196ba9a0e 100644 --- a/community/openjdk8-corretto/APKBUILD +++ b/community/openjdk8-corretto/APKBUILD @@ -42,6 +42,12 @@ makedepends_host=" libxtst-dev linux-headers " +[ "$CBUILD" = "$CTARGET" ] && makedepends=" + $makedepends_build + $makedepends_host + java-cacerts + java-common + " subpackages=" $pkgname-demos $pkgname-doc diff --git a/community/openjdk8-loongarch/APKBUILD b/community/openjdk8-loongarch/APKBUILD index 4943dce22f1..7a1a5cb5914 100644 --- a/community/openjdk8-loongarch/APKBUILD +++ b/community/openjdk8-loongarch/APKBUILD @@ -40,6 +40,12 @@ makedepends_host=" linux-headers zlib-dev " +[ "$CBUILD" = "$CTARGET" ] && makedepends=" + $makedepends_build + $makedepends_host + java-cacerts + java-common + " subpackages=" $pkgname-demos $pkgname-doc