From f1cc076b27d39a33e0c34483e07222f449b011ab Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 2 Aug 2021 20:53:57 +0300 Subject: [PATCH] ecj: wrappers should unset JAVA_HOME Otherwise it will work properly if package openjdk-17 is installed. Issue https://github.com/termux/termux-packages/issues/7233 --- packages/ecj/build.sh | 2 +- packages/ecj/ecj | 2 ++ packages/ecj/ecj-24 | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/ecj/build.sh b/packages/ecj/build.sh index c202ff2f7..d7f469f79 100644 --- a/packages/ecj/build.sh +++ b/packages/ecj/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="@termux" _VERSION=4.12 _DATE=201906051800 TERMUX_PKG_VERSION=1:${_VERSION} -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=http://archive.eclipse.org/eclipse/downloads/drops${_VERSION:0:1}/R-${_VERSION}-${_DATE}/ecj-${_VERSION}.jar TERMUX_PKG_SHA256=69dad18a1fcacd342a7d44c5abf74f50e7529975553a24c64bce0b29b86af497 TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/ecj/ecj b/packages/ecj/ecj index bebd475b6..a186b91ad 100755 --- a/packages/ecj/ecj +++ b/packages/ecj/ecj @@ -1,5 +1,7 @@ #!/bin/sh +unset JAVA_HOME + # -proc:none to disable annotation processing. # -7 for java 1.7 compatibility. dalvikvm -Xmx256m \ diff --git a/packages/ecj/ecj-24 b/packages/ecj/ecj-24 index f8175e19f..14f74bfce 100755 --- a/packages/ecj/ecj-24 +++ b/packages/ecj/ecj-24 @@ -1,5 +1,7 @@ #!/bin/sh +unset JAVA_HOME + # -proc:none to disable annotation processing. # -7 for java 1.7 compatibility. dalvikvm -Xmx256m \