summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-24 23:11:02 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-25 11:42:39 +0200
commit7da7682965c0465a4c6ae017870daadc2b9ac099 (patch)
tree82d4b59464b07a2311ee563995c172f4c22c443b /RepositoryExternal.mk
parentdb23d4b0e3fde9aef91bd333b259092ddea58306 (diff)
gbuild: add gb_Jar_use_external_jar
... which is an ugly hack to handle jar files that are from externals and are not bundled in the main instset, only in extensions. Change-Id: I992242b7c990c24318b040e98b6632e3b78b6f63
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d2d060220c60..2232710872cb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2820,21 +2820,21 @@ $(eval $(call gb_Helper_register_jars,OXT,\
))
define gb_Jar__use_commons-codec
-$(call gb_Jar_use_jar,$(1),commons-codec-1.6)
+$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/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_jar,$(1),commons-httpclient-3.1)
+$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/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_jar,$(1),commons-lang-2.4)
+$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-lang-2.4.jar)
endef
define gb_ExternalProject__use_commons-lang
$(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang)