swext: fix wiki-publisher / apache-commons build

gb_Extension_use_package is inherently broken because it creates cyclic
dependencies with gb_Extension_add_file.  Fortunately it's not necessary
because the added file is a target by virtue of being in the Package.

There is another cyclic dependency that can be avoided by not using the
Package in gb_ExternalProject__use_commons-logging.

Change-Id: Id4ddd4f78d819e47882387533a2d64693b2879ea

5 files changed, 7 insertions, 20 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ccb0fdc58fb6..75d2b5248821 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2860,7 +2860,7 @@ $(call gb_Jar_use_external_project,$(1),apache_commons_logging)
 $(call gb_Jar_use_jar,$(1),commons-logging-1.1.1)
 endef
 define gb_ExternalProject__use_commons-logging
-$(call gb_ExternalProject_use_package,$(1),apache_commons_logging)
+$(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging)
 endef
 
 endif # SYSTEM_APACHE_COMMONS
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index 5e03d95811a8..02ffbada4daf 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 			$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
 				-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \
-				-Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \
+				-Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar)" \
 			-Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \
 			-Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \
 			-Dliblayout.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index 3a9c27338d68..3a923b39ec47 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
 			-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
 			$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
 				-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \
-				-Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \
+				-Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar)" \
 			-Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \
 			-Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \
 			-Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index d98259eb53f1..b69544358717 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -287,18 +287,6 @@ $(call gb_Extension__get_preparation_target,$(1)) \
 
 endef
 
-define gb_Extension_use_package
-$(call gb_Extension__get_preparation_target,$(1)) \
-	:| $(call gb_Package_get_target,$(2))
-
-endef
-
-define gb_Extension_use_packages
-$(foreach package,$(2),$(call gb_Extension_use_package,$(1),$(package)))
-
-endef
-
-
 define gb_Extension__localize_properties_onelang
 $(call gb_Extension_get_target,$(1)) : FILES += $(2)
 ifneq ($(filter-out en-US,$(4)),)
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index 5e04323e180b..d43eb0055960 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -13,16 +13,15 @@ $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
 
 $(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml))
 
-$(eval $(call gb_Extension_use_package,wiki-publisher,apache_commons_logging))
+$(eval $(call gb_Extension_use_default_description,wiki-publisher))
+$(eval $(call gb_Extension_use_default_license,wiki-publisher))
 
+ifneq ($(SYSTEM_APACHE_COMMONS),YES)
+$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_logging))
 $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_codec))
 $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient))
 $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_lang))
 
-$(eval $(call gb_Extension_use_default_description,wiki-publisher))
-$(eval $(call gb_Extension_use_default_license,wiki-publisher))
-
-ifneq ($(SYSTEM_APACHE_COMMONS),YES)
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.6.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar))
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar))
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar))