diff options
| author | Rene Engelhard <rene@debian.org> | 2015-10-09 20:58:55 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-15 17:13:00 +0200 |
| commit | 0b1726ee446cfdaae8a9ac6d7222f1b1eed66e30 (patch) | |
| tree | 9e73355db25d48c74317bc764445852736e72b25 /RepositoryExternal.mk | |
| parent | 9d82731793602473c78ab5131156a266e875da98 (diff) | |
remove now unneeded apache-commons libs
Change-Id: Ida7a5f5db5bba8d03bf31de760a908cee9a514e4
(cherry picked from commit a41a4a22f1a7e82ab64f28b71f5ce6acc1c04921)
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8f988d70cdfa..eb12c36001ec 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3625,21 +3625,6 @@ endif ifneq ($(SYSTEM_APACHE_COMMONS),) -define gb_Jar__use_commons-codec -$(call gb_Jar_use_system_jar,$(1),$(COMMONS_CODEC_JAR)) -endef -gb_ExternalProject__use_commons-codec := - -define gb_Jar__use_commons-httpclient -$(call gb_Jar_use_system_jar,$(1),$(COMMONS_HTTPCLIENT_JAR)) -endef -gb_ExternalProject__use_commons-httpclient := - -define gb_Jar__use_commons-lang -$(call gb_Jar_usadd_linked_libse_system_jar,$(1),$(COMMONS_LANG_JAR)) -endef -gb_ExternalProject__use_commons-lang := - define gb_Jar__use_commons-logging $(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR)) endef @@ -3652,41 +3637,6 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\ commons-logging-$(COMMONS_LOGGING_VERSION) \ )) endif -$(eval $(call gb_Helper_register_jars,OXT,\ - $(if $(filter TRUE,$(HAVE_JAVA6)),commons-codec-1.9,commons-codec-1.6) \ - commons-httpclient-3.1 \ - $(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)\ -$(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) -endef - -define gb_Jar__use_commons-httpclient -$(call gb_Jar_use_external_project,$(1),apache_commons_httpclient) -$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar,commons-httpclient-3.1.jar) -endef -define gb_ExternalProject__use_commons-httpclient -$(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient) -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)\ -$(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) -endef define gb_Jar__use_commons-logging $(call gb_Jar_use_external_project,$(1),apache_commons_logging) |