summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Kitagawa2024-10-17 12:53:56 +0900
committerMasahiro Kitagawa2024-10-17 12:56:22 +0900
commite6469ff7f6a8eaea8188443ae383b9f27c17fbfa (patch)
tree096e2b7db36a46c35187cdcd6d973b0ba03e6000
parentc5173b93d528b94001e8dd17f8c254826b825f45 (diff)
downloadaur-lightzone.tar.gz
Avoid setting JAVA_HOME
Use archlinux-java to select default JDK to build packages.
-rw-r--r--PKGBUILD13
1 files changed, 1 insertions, 12 deletions
diff --git a/PKGBUILD b/PKGBUILD
index fe12a3192207..16e7097362c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -54,22 +54,11 @@ 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
- echo $JAVA_HOME
-
# https://github.com/Aries85/LightZone/issues/218#issuecomment-357868376
MAKEFLAGS="-j1"
cd "${srcdir}/LightZone-${pkgver}/"
- ant -f linux/build.xml jar
+ JAVA_HOME=/usr/lib/jvm/default ant -f linux/build.xml jar
}
package() {