diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-04-24 09:08:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-04-24 13:04:52 +0200 |
| commit | 67580722d95af71259dcbe73b71afdd4c23a4a83 (patch) | |
| tree | a653916ef90fea9aa4f75a539c24a796d5c6d920 /external | |
| parent | 1d61d9ae72562a03ca0d3f1649d9471862b29d74 (diff) | |
workdir/UnpackedTarball/languagetool/build.xml uses ${source}, ${target}
in its javac invocations, so we apparently need to set those variables instead
of ant.build.javac.source/target (which are documented at
<https://ant.apache.org/manual/javacprops.html> to be supported since Ant 1.7,
but are apparently not used here). (Found when doing a test build with Java 12
and JAVA_SOURCE/TARGET_VER explicitly configured as 7 with
<https://gerrit.libreoffice.org/#/c/71218/> "Allow to pass
JAVA_SOURCE/TARGET_VER into configure", which caused building
external/languagetool to nevertheless complain about unsupported 1.6
source/target switches.)
Change-Id: I624f77b65ef81bc592a78559e67062a42cfff05a
Reviewed-on: https://gerrit.libreoffice.org/71219
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/languagetool/ExternalProject_languagetool.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/languagetool/ExternalProject_languagetool.mk b/external/languagetool/ExternalProject_languagetool.mk index ccca669f66f0..0d96f4963acf 100644 --- a/external/languagetool/ExternalProject_languagetool.mk +++ b/external/languagetool/ExternalProject_languagetool.mk @@ -26,8 +26,8 @@ $(call gb_ExternalProject_get_state_target,languagetool,build) : $(if $(verbose),-v,-q) \ -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ - -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dsource=$(JAVA_SOURCE_VER) \ + -Dtarget=$(JAVA_TARGET_VER) \ $(if $(debug),-Dbuild.debug="on") \ -Dext.ooo.juh.lib="$(call gb_Jar_get_target,juh)" \ -Dext.ooo.jurt.lib="$(call gb_Jar_get_target,jurt)" \ |