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 /RepositoryExternal.mk | |
| 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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 2 |
1 files changed, 1 insertions, 1 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 |