diff options
| author | Masahiro Kitagawa | 2024-04-24 22:24:58 +0900 |
|---|---|---|
| committer | Masahiro Kitagawa | 2024-04-24 22:24:58 +0900 |
| commit | 834fddd3e2ea111c1137948c2ee190719f67ffeb (patch) | |
| tree | 3e4fe27b9150b4909b81ec95bc6a10fbcb52442e | |
| parent | 2c5d25ffca77e870ee6a3f127b8a8f1725af519b (diff) | |
| download | aur-lightzone.tar.gz | |
Set MAKEPKG_JAVA_VERSION to fix javahelp2 build failure
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -5,7 +5,7 @@ pkgbase = lightzone url = https://github.com/ktgw0316/LightZone/ arch = x86_64 license = BSD-3-Clause - makedepends = java-environment=21 + makedepends = java-environment>=17 makedepends = ant makedepends = autoconf makedepends = gcc @@ -17,7 +17,7 @@ pkgbase = lightzone depends = gcc-libs depends = glibc depends = hicolor-icon-theme - depends = java-runtime>=21 + depends = java-runtime>=17 depends = javahelp2 depends = lcms2 depends = lensfun @@ -17,7 +17,7 @@ depends=( 'gcc-libs' 'glibc' 'hicolor-icon-theme' - 'java-runtime>=21' + 'java-runtime>=17' 'javahelp2' 'lcms2' 'lensfun' @@ -26,7 +26,7 @@ depends=( 'libraw' 'libxml2' ) -makedepends=('java-environment=21' +makedepends=('java-environment>=17' 'ant' 'autoconf' 'gcc' @@ -52,6 +52,10 @@ prepare() { build() { if [ -d /usr/lib/jvm/java-21-openjdk ]; then export JAVA_HOME=/usr/lib/jvm/java-21-openjdk + export MAKEPKG_JAVA_VERSION=21 + elif [ -d /usr/lib/jvm/java-17-openjdk ]; then + export JAVA_HOME=/usr/lib/jvm/java-21-openjdk + export MAKEPKG_JAVA_VERSION=17 else export JAVA_HOME=/usr/lib/jvm/default fi |