aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/openjdk8/README8
-rw-r--r--development/openjdk8/openjdk8.SlackBuild4
2 files changed, 6 insertions, 6 deletions
diff --git a/development/openjdk8/README b/development/openjdk8/README
index ad99bc173c7d..fe655c3c775d 100644
--- a/development/openjdk8/README
+++ b/development/openjdk8/README
@@ -4,9 +4,12 @@ testing, and running programs written in Java.
Before installing this package please consider any other jdk's/jre's that you
have already installed as they may cause conflicts with the PATH, JAVA_HOME
-and MANPATH variables (this includes the 'openjdk' dependency package -- you
+and MANPATH variables (this includes the 'openjdk7' dependency package -- you
may wish to remove it after you're done.)
+If you already have 'openjdk8' on your system (and are compiling a newer
+version, for example) you don't need the 'openjdk7' dependency.
+
After installing the package you will need to logout/reboot your machine
as it will add new files to the /etc/profile.d folder.
@@ -27,6 +30,3 @@ org.eclipse.jdt.internal.compiler.ReadManager.run(ReadManager.java:166)
simply run the build again. This happens early so it shouldn't be that of a
problem. At least 1 out of 5 runs so far have always succeded.
-
-If you already have 'openjdk8' on your system (and are compiling a newer
-version, for example) you don't need the 'openjdk' dependency.
diff --git a/development/openjdk8/openjdk8.SlackBuild b/development/openjdk8/openjdk8.SlackBuild
index 5cc6309ad485..6691c01d6d70 100644
--- a/development/openjdk8/openjdk8.SlackBuild
+++ b/development/openjdk8/openjdk8.SlackBuild
@@ -32,7 +32,7 @@ ICEDTEA=icedtea-3.13.0
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm; echo "Unsupported arch $ARCH"; exit 1;;
*) ARCH=$( uname -m ) ;;
esac
@@ -53,7 +53,7 @@ else
fi
BOOT_JAVA=/usr/lib${LIBDIRSUFFIX}/openjdk7
-[ ! -d ${BOOT_JAVA} ] && BOOT_JAVA=${BOOT_JAVA}8
+[ ! -d ${BOOT_JAVA} ] && BOOT_JAVA=${BOOT_JAVA%?}8
[ ! -d ${BOOT_JAVA} ] && { echo "Boot java not found"; exit 1; }
set -e