diff options
| author | Robert Antoni Buj i Gelonch <robert.buj@gmail.com> | 2014-10-27 19:52:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-18 09:38:16 +0000 |
| commit | 04d4b703a0cad67ddbb149303e73bc722cd06884 (patch) | |
| tree | 3d89fb7593febed3702640489f2d342b521a0706 /external | |
| parent | ebabf6d1fa648d62dd63529e9fe64dcb631caee8 (diff) | |
Apache Commons Codec 1.9 at least requires Java 1.6 and non debug version
Change-Id: Ie7834a908c8b19cfa46d71ff6fd712e10bbe8fbb
Reviewed-on: https://gerrit.libreoffice.org/12115
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_codec.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/external/apache-commons/ExternalProject_apache_commons_codec.mk b/external/apache-commons/ExternalProject_apache_commons_codec.mk index 2135cb4c70d2..aedda046febe 100644 --- a/external/apache-commons/ExternalProject_apache_commons_codec.mk +++ b/external/apache-commons/ExternalProject_apache_commons_codec.mk @@ -22,10 +22,15 @@ $(call gb_ExternalProject_get_state_target,apache_commons_codec,build) : -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ - -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ,$(if $(filter TRUE,$(HAVE_JAVA6)) \ + ,-Dcompile.source=1.6 -Dcompile.target=1.6 \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ ) \ - $(if $(debug),-Dbuild.debug="on") \ + $(if $(filter TRUE,$(HAVE_JAVA6)) \ + ,$(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \ + ,$(if $(debug),-Dbuild.debug="on") \ + ) \ jar \ ) |