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 /RepositoryExternal.mk | |
| 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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e1a3a9ed6c0c..2db4c383c872 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3252,14 +3252,17 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ )) endif $(eval $(call gb_Helper_register_jars,OXT,\ - commons-codec-1.9 \ + $(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9,commons-codec-1.6) \ commons-httpclient-3.1 \ - commons-lang3-3.3.1.jar \ + $(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4) \ )) define gb_Jar__use_commons-codec $(call gb_Jar_use_external_project,$(1),apache_commons_codec) -$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.9.jar,commons-codec-1.9.jar) +$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_codec)\ +$(if $(filter TRUE,$(HAVE_JAVA6)),/dist/commons-codec-1.9.jar,/dist/commons-codec-1.6.jar),\ +$(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9.jar,commons-codec-1.6.jar)\ +) endef define gb_ExternalProject__use_commons-codec $(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec) @@ -3275,7 +3278,10 @@ endef define gb_Jar__use_commons-lang $(call gb_Jar_use_external_project,$(1),apache_commons_lang) -$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/target/commons-lang3-3.3.1.jar,commons-lang3-3.3.1.jar) +$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_lang)\ +$(if $(filter TRUE,$(HAVE_JAVA6)),/target/commons-lang3-3.3.1.jar,/dist/commons-lang-2.4.jar),\ +$(if $(filter TRUE,$(HAVE_JAVA6)),commons-lang3-3.3.1.jar,commons-lang-2.4.jar)\ +) endef define gb_ExternalProject__use_commons-lang $(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang) |