diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-03-03 05:42:21 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-03 05:42:21 +0000 |
commit | f1801aa7be2329c07c4c2bd7522e03522b34c437 (patch) | |
tree | 921f3b21629f755c7e3cd4490e3d459026b1b74e /net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch | |
parent | c8042d10e135808d5f2b48867bc291e00664b99b (diff) |
gentoo auto-resync : 03:03:2024 - 05:42:20
Diffstat (limited to 'net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch')
-rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch new file mode 100644 index 000000000000..452435a6751c --- /dev/null +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch @@ -0,0 +1,33 @@ +This patch searches the jre 21 binary in the gentoo specific directories. + +Signed-off-by: Julien Roy <julien@jroy.ca> + +--- a/bin/signal-cli ++++ b/bin/signal-cli +@@ -118,13 +118,19 @@ + + + # Determine the Java command to use to start the JVM. +-if [ -n "$JAVA_HOME" ] ; then +- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +- # IBM's JDK on AIX uses strange locations for the executables +- JAVACMD=$JAVA_HOME/jre/sh/java +- else +- JAVACMD=$JAVA_HOME/bin/java +- fi ++# This package needs Java 21, ++# so we must search for matching java binaries ++for I in /usr/lib*/openjdk-21 /opt/openjdk-bin-21 /opt/openjdk-jre-bin-21; do ++ J_TRY="$I/bin/java" ++ if [ -x "$J_TRY" ] ; then ++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "17." ++ if [ $? -eq 0 ] ; then ++ JAVACMD="$J_TRY" ++ break ++ fi ++ fi ++done ++if [ -n "$JAVACMD" ] ; then + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + |