[packages/antlr] alter java lookup in antlr script and turn jre into soft dep; rel 20
atler
atler at pld-linux.org
Thu May 7 12:22:27 CEST 2026
commit 4ec53a34cd218afece142ee72db8985e9c386ac6
Author: Jan Palus <atler at pld-linux.org>
Date: Thu May 7 12:18:41 2026 +0200
alter java lookup in antlr script and turn jre into soft dep; rel 20
- prefer $JAVA_HOME
- fallback to "java" found in current $PATH instead of using java path
from build time
antlr.spec | 6 ++++--
prefer-java-home.patch | 13 +++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/antlr.spec b/antlr.spec
index f8efa3b..21832d6 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -25,7 +25,7 @@ Summary: ANother Tool for Language Recognition
Summary(pl.UTF-8): Jeszcze jedno narzędzie do rozpoznawania języka
Name: antlr
Version: 2.7.7
-Release: 19
+Release: 20
License: Public Domain
Group: Development/Tools
Source0: http://www.antlr2.org/download/%{name}-%{version}.tar.gz
@@ -33,6 +33,7 @@ Source0: http://www.antlr2.org/download/%{name}-%{version}.tar.gz
Patch0: %{name}-DESTDIR.patch
Patch1: %{name}-strcasecmp.patch
Patch2: %{name}-gentoo.patch
+Patch3: prefer-java-home.patch
URL: http://www.antlr2.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -50,7 +51,7 @@ BuildRequires: java-gcj-compat-devel
%buildrequires_jdk
Requires: jpackage-utils
%endif
-Requires: jre
+Suggests: jre
%endif
Conflicts: pccts < 1.33MR33-6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -116,6 +117,7 @@ Przykładowe programy używające ANTLR.
%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
+%patch -P3 -p1
%build
cp -f /usr/share/automake/config.sub scripts
diff --git a/prefer-java-home.patch b/prefer-java-home.patch
new file mode 100644
index 0000000..df117f4
--- /dev/null
+++ b/prefer-java-home.patch
@@ -0,0 +1,13 @@
+--- antlr-2.7.7/scripts/run-antlr.in.orig 2006-11-01 22:37:18.000000000 +0100
++++ antlr-2.7.7/scripts/run-antlr.in 2026-05-07 00:52:31.561779246 +0200
+@@ -65,4 +65,9 @@
+ CLASSPATH="${ANTLR_JAR}@PATH_SEPARATOR@${CLASSPATH}"
+ fi
+ export CLASSPATH
+- at JAVA@ antlr.Tool $*
++if test "x$JAVA_HOME" = x; then
++ JAVA=java
++else
++ JAVA="$JAVA_HOME/bin/java"
++fi
++$JAVA antlr.Tool $*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/antlr.git/commitdiff/4ec53a34cd218afece142ee72db8985e9c386ac6
More information about the pld-cvs-commit
mailing list