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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 12 |
1 files changed, 0 insertions, 12 deletions
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)),) |