Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-24 10:02:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

office/LibreOffice: Accommodate renaming openjdk to openjdk7

Browse source 
Signed-off-by: Christoph Willing <chris.willing@linux.com>
This commit is contained in:
Christoph Willing 2019-06-08 23:03:08 +10:00 committed by Willy Sudiarto Raharjo
parent ac6a2f66e3
commit 6f2f6d7cca
No known key found for this signature in database
GPG key ID: 887B8374D7333381
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
office/LibreOffice/LibreOffice.SlackBuild
View file

@ -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

6
office/LibreOffice/README
View file

@ -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.