diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2015-04-25 07:34:04 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2015-04-26 07:38:57 +0200 |
| commit | d311260c0d347b3c933706b8cac48b82a653e1c7 (patch) | |
| tree | 5dbaf3699a8527d5075ec00d9dfab2dcd726b568 /solenv | |
| parent | 3a96d8ead86dc210085f09076fd270f247442f0a (diff) | |
--enable-mergelibs: Turns out we don't need to install sax
We are lucky, saxparser(expwrap) is only needed to build localedata* libs
which are only runtime dependencies, and can be built *after* libmerged.
So, simplify and move runtime deps to CppunitTest.
This reverts commits 59cea45ec247df1acb691308c940ff97673e4c48
and partially 5e45637568ceefee21fe329a5254881963fecd7a
Change-Id: I1a1fb4a48fd1a22a9b3a48f0eb0f123649c113b0
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 5 |
3 files changed, 11 insertions, 8 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index a6eae56b258b..a4e9fa9197ab 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -40,11 +40,17 @@ gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes --inst endif # defined by platform -# gb_CppunitTest_TARGETTYPE # gb_CppunitTest_get_filename -gb_CppunitTest_CPPTESTDEPS := $(call gb_Executable_get_runtime_dependencies,cppunittester) +gb_CppunitTest_RUNTIMEDEPS := $(call gb_Executable_get_runtime_dependencies,cppunittester) gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppunittester) +# i18npool dlopens localedata_* libraries. +gb_CppunitTest_RUNTIMEDEPS += \ + $(call gb_Library_get_target,localedata_en) \ + $(call gb_Library_get_target,localedata_es) \ + $(call gb_Library_get_target,localedata_euro) \ + $(call gb_Library_get_target,localedata_others) \ + define gb_CppunitTest__make_args $(HEADLESS) \ "-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT))" \ @@ -78,7 +84,7 @@ $(call gb_CppunitTest_get_clean_target,%) : rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log) .PHONY : $(call gb_CppunitTest_get_target,%) -$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS) +$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS) $(call gb_Output_announce,$*,$(true),CUT,2) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 028b7cbc8b02..253d6dbca26c 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -191,7 +191,7 @@ $$(eval $$(call gb_Output_error,$(1) is not a valid group for installed librarie endif $(call gb_Helper__register_libraries,$(1),$(3)) -gb_Library_MODULE_$(2) += $(filter-out $(filter-out sax,$(gb_MERGEDLIBS)),$(3)) +gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS),$(3)) $(if $(filter UNOVERLIBS RTVERLIBS,$(1)),\ gb_SdkLinkLibrary_MODULE_sdk += $(3)) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 82c47399d6f2..b8c11f364801 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -836,10 +836,7 @@ gb_BUILD_HELPER_TOOLS := $(foreach exe,\ svidl \ unoidl-check \ unoidl-write \ - , $(call gb_Executable__get_workdir_linktargetname,$(exe))) \ - $(foreach lib,\ - expwrap \ - , $(call gb_Library__get_workdir_linktargetname,$(lib))) + , $(call gb_Executable__get_workdir_linktargetname,$(exe))) # call gb_LinkTarget__is_build_lib,linktargetname define gb_LinkTarget__is_build_lib |