diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2014-05-20 12:55:56 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-21 07:57:55 -0500 |
| commit | 7e4708739dd7a4d9db3a093a9f36d95f0192e639 (patch) | |
| tree | c266bbc501af2ec059dc387e35495f5a064b6cd7 /external/apache-commons | |
| parent | e142ad49cee072e88ab47d6caa64adfa6df7d9fa (diff) | |
care for Java 1.5 support in external packages
apache commons-lang 3.3.1 and commons-codec 1.9 are for use
only with JDK 1.6 and higher
see commits:
1731f6e692bb0a07a2bca4b1b190163f209d2b9e "bump apache-commons-lang to 3.3.1"
3dad9b1019bebcc6db63a424afa146e007f768d2 "bump apache-commons-codec to 1.9"
Change-Id: I3e71f6474becafe6c91836bbac5c6a8b7ca3442c
Reviewed-on: https://gerrit.libreoffice.org/9312
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/apache-commons')
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_httpclient.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk index 92e60dea5284..f8cec7429775 100644 --- a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk @@ -24,7 +24,10 @@ $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) : -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.3.jar" \ - -Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar" \ + $(if $(filter TRUE,$(HAVE_JAVA6))\ + ,-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar" \ + ,-Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar" \ + ) \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ |