summaryrefslogtreecommitdiffstats
path: root/office
diff options
context:
space:
mode:
author Christoph Willing <chris.willing@linux.com>2019-06-08 23:03:08 +1000
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2019-06-09 05:33:19 +0700
commit6f2f6d7cca61d6dccb7451829115bb9125c742af (patch)
tree9225efabe1bd68086837819ec27408f1f3d71121 /office
parentac6a2f66e3136d35cbd3e6c71ccdcbfa5c32a380 (diff)
downloadslackbuilds-6f2f6d7cca61d6dccb7451829115bb9125c742af.tar.gz
slackbuilds-6f2f6d7cca61d6dccb7451829115bb9125c742af.tar.xz
office/LibreOffice: Accommodate renaming openjdk to openjdk7
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Diffstat (limited to 'office')
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild6
-rw-r--r--office/LibreOffice/README6
2 files changed, 6 insertions, 6 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 6ce5c43442..071eadea37 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -91,9 +91,9 @@ jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true
# If PARALLEL environment variable is set, use that to override everything.
[ "${PARALLEL:-0}" != "0" ] && parallel="--with-parallelism=$PARALLEL"
-JAVA=${JAVA:-openjdk}
-if [ "$JAVA" = "openjdk" ]; then
- . /etc/profile.d/openjdk.sh
+JAVA=${JAVA:-openjdk7}
+if [ "$JAVA" = "openjdk7" ]; then
+ . /etc/profile.d/openjdk7.sh
use_java="--with-java=java"
elif [ "$JAVA" = "openjdk8" ]; then
. /etc/profile.d/openjdk8.sh
diff --git a/office/LibreOffice/README b/office/LibreOffice/README
index 684db28e8f..69c212624c 100644
--- a/office/LibreOffice/README
+++ b/office/LibreOffice/README
@@ -47,12 +47,12 @@ Build time environment variables that may be set to vary features are as follows
languages.
5. A number of Java Development Kits are suitable for building LibreOffice.
- The default JDK for this SlackBuild is openjdk. Others may be chosen by
+ The default JDK for this SlackBuild is openjdk7. Others may be chosen by
setting the JAVA environment variable when running the SlackBuild. Recognised
- values are openjdk (the default, not explicitly required), openjdk8 and jdk
+ values are openjdk7 (the default, not explicitly required), openjdk8 and jdk
e.g. JAVA=jdk (to use SBo jdk package with Oracle binary version). Using an
alternate JDK will require presence of the appropriate package when building
- LibreOffice. Since the apache-ant package is already required by openjdk,
+ LibreOffice. Since the apache-ant package is already required by openjdk7,
hence openjdk8, its listing in the REQUIRES field is redundant in these cases.
However it remains listed to accomodate the case of JAVA=jdk, in which the
apache-ant package is needed to build LibreOffice.