diff options
Diffstat (limited to 'net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch')
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch deleted file mode 100644 index 840c249b976f..000000000000 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -Signed-off-by: Martin Dummer <martin.dummer@gmx.net> - ---- a/bin/signal-cli -+++ b/bin/signal-cli -@@ -84,13 +84,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 11, but Java 11 is currently not part of the gentoo eselect config system -+# so we must search for matching java binaries -+for I in /usr/lib*/openjdk-11 /opt/openjdk-bin-11 /opt/openjdk-jre-bin-11; 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 - |