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 /download.lst | |
| 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 'download.lst')
| -rw-r--r-- | download.lst | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/download.lst b/download.lst index 8a3b889b5b46..59cc4a934b5f 100644 --- a/download.lst +++ b/download.lst @@ -1,8 +1,14 @@ export ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d export ABW_TARBALL := libabw-0.0.2.tar.bz2 -export APACHE_COMMONS_CODEC_TARBALL := 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip +export APACHE_COMMONS_CODEC_TARBALL := $(if $(filter TRUE,$(HAVE_JAVA6))\ + ,048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip\ + ,2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz\ +) export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -export APACHE_COMMONS_LANG_TARBALL := 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz +export APACHE_COMMONS_LANG_TARBALL := $(if $(filter TRUE,$(HAVE_JAVA6))\ + ,8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz\ + ,625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz\ +) export APACHE_COMMONS_LOGGING_TARBALL := e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz export APR_MD5SUM := eff9d741b0999a9bbab96862dd2a2a3d export APR_TARBALL := apr-1.4.8.tar.gz |