From 12c3053d6335e2a2f9a919890ee23c14c245e173 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Mon, 10 Apr 2017 00:40:17 +0200 Subject: [PATCH] libreoffice: enable java Closes: #6191 [via git-merge-pr] --- srcpkgs/libreoffice/template | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 8d49f518da..ac17fe66b8 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -95,6 +95,13 @@ case "$XBPS_TARGET_MACHINE" in ;; esac +case "$XBPS_TARGET_MACHINE" in + *-musl) + ;; + *) makedepends+=" apache-ant openjdk " + ;; +esac + post_fetch() { local srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} pkg mkdir -p ${wrksrc}/external/tarballs @@ -131,7 +138,6 @@ do_configure() { configure_args+=" --with-vendor='VoidLinux'" configure_args+=" --with-help" configure_args+=" --with-alloc=system" - configure_args+=" --without-java" configure_args+=" --without-system-dicts" configure_args+=" --disable-odk" configure_args+=" --enable-python=system" @@ -146,6 +152,7 @@ do_configure() { configure_args+=" --enable-extra-font" case "$XBPS_TARGET_MACHINE" in *-musl) # Can't use the glibc external modules + configure_args+=" --without-java" ;; *) configure_args+=" --enable-ext-mariadb-connector" configure_args+=" --enable-ext-watch-window" @@ -159,6 +166,8 @@ do_configure() { configure_args+=" --enable-ext-google-docs" configure_args+=" --enable-ext-nlpsolver" configure_args+=" --enable-ext-languagetool" + configure_args+=" --with-jdk-home=/usr/lib/jvm/openjdk" + configure_args+=" --without-junit" ;; esac configure_args+=" --with-tls=nss"