diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
| commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
| tree | cf61513204d97974179580065e85df5c8009087c /net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch | |
| parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) | |
gentoo resync : 03.03.2021
Diffstat (limited to 'net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch')
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-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.8.0-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch new file mode 100644 index 000000000000..5d9bd2909968 --- /dev/null +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch @@ -0,0 +1,33 @@ +Signed-off-by: Martin Dummer <martin.dummer@gmx.net> + +diff -Naur a/bin/signal-cli b/bin/signal-cli +--- a/bin/signal-cli ++++ b/bin/signal-cli +@@ -84,13 +84,20 @@ + + + # 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 11, but Java 11 is currently not part of the gentoo eselect config system ++# so we must search for matching java binaries ++JAVA_DIRS="$JAVA_HOME /opt/openjdk-jre-bin-11 /opt/openjdk-bin-11" ++for I in $JAVA_DIRS ; do ++ J_TRY="$I/bin/java" ++ if [ -x "$J_TRY" ] ; then ++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "11." ++ 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 + |