diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-26 20:17:52 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-26 21:39:18 +0200 |
| commit | a60427ef5a9861123ffbb78fca769d3b56473af4 (patch) | |
| tree | c278c9c3e869089eced1db5db73db54f9460f249 /swext | |
| parent | fcfdefa13f282b9b67a1f22fbed3559e44264ab9 (diff) | |
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
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 9 |
1 files changed, 4 insertions, 5 deletions
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)) |