mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-16 19:50:19 +01:00
office/LibreOffice: Added control over make parallelism
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
This commit is contained in:
parent
27b0499649
commit
7a68b5d313
2 changed files with 21 additions and 1 deletions
|
@ -28,7 +28,7 @@ PRGNAM=LibreOffice
|
|||
SRCNAM=libreoffice
|
||||
VERSION=${VERSION:-5.3.2.2}
|
||||
SHORT_VERSION=${VERSION%.*.*}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
TAG=${TAG:-_SBo}
|
||||
PACKAGER=${PACKAGER:-"AnonymousCoward"}
|
||||
|
||||
|
@ -88,6 +88,14 @@ vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc"
|
|||
kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ] && kde4="--disable-kde4"
|
||||
LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"}
|
||||
|
||||
# By default, LibreOffice ignores MAKEFLAGS -j option and uses all available cpu cores.
|
||||
parallel=""
|
||||
# If MAKEFLAGS contains -j option, we extract its value to override the default.
|
||||
jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true
|
||||
[ -n "$jval" ] && parallel="--with-parallelism=$jval"
|
||||
# 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
|
||||
|
@ -123,6 +131,7 @@ fi
|
|||
$vlc \
|
||||
$kde4 \
|
||||
$use_java \
|
||||
$parallel \
|
||||
--with-x \
|
||||
--with-tls="nss" \
|
||||
--without-krb5 \
|
||||
|
|
|
@ -40,6 +40,17 @@ Build time environment variables that may set to vary features are as follows:
|
|||
apache-ant package is needed to build LibreOffice.
|
||||
Finally, setting JAVA=no will build LibreOffice without any Java support.
|
||||
|
||||
6. The number of parallel make jobs used by the LibreOffice build system defaults
|
||||
to the number of available cpu cores. If the MAKEFLAGS environment variable
|
||||
contains the -j option e.g.
|
||||
MAKEFLAGS=-j6
|
||||
then the SlackBuild will pass this to the LibreOffice build system
|
||||
(via its --with-parallelism configure option). The number of parallel make jobs
|
||||
is further controlled with the PARALLEL environment varaiable e.g.
|
||||
PARALLEL=1 sh LibreOffice.SlackBuild
|
||||
which would limit building to a single make process, overriding any value set
|
||||
with the -j option in MAKEFLAGS.
|
||||
|
||||
For performance reasons, this Slackbuild sets GTK2 to be used at runtime.
|
||||
Alternatives (gen, gtk3, kde4) may still be used by setting SAL_USE_VCLPLUGIN
|
||||
in the user environment.
|
||||
|
|
Loading…
Reference in a new issue