mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix few problems with gbuildized liborcus

Browse Source 
Change-Id: Ic8717085f0f71470eadc225eb062c1dee24d24f7
This commit is contained in:
Matúš Kukan
2012-09-11 15:38:52 +02:00
parent e31e8a13b8
commit c83d82e71b
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
RepositoryExternal.mk
View File

@@ -1909,19 +1909,12 @@ endef
else # !SYSTEM_LIBORCUS else # !SYSTEM_LIBORCUS
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
orcus \
))
define gb_LinkTarget__use_orcus define gb_LinkTarget__use_orcus
$(call gb_LinkTarget_use_unpacked,$(1),orcus)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,orcus/include) \ -I$(call gb_UnpackedTarball_get_dir,orcus/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_external_library,$(1),orcus,liborcus)
orcus \
)
endef endef
endif # SYSTEM_LIBORCUS endif # SYSTEM_LIBORCUS

2
liborcus/ExternalProject_liborcus.mk
View File

@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(GNUMAKE) \ && $(GNUMAKE) \
&& cp src/liborcus/.libs/liborcus-0.2.a $(OUTDIR)/lib \ && cp src/liborcus/.libs/liborcus-0.2.a $(OUTDIR)/lib \
&& ln -s $(OUTDIR)/lib/liborcus.a liborcus-0.2.a \ && ln -s liborcus-0.2.a $(OUTDIR)/lib/liborcus.a \
&& touch $@ && touch $@
endif endif

14
solenv/gbuild/LinkTarget.mk
View File

@@ -745,18 +745,12 @@ $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib)))
endef endef
define gb_LinkTarget_add_linked_static_external_libs # gb_LinkTarget_use_static_external_library linktarget library externalproject
$$(call gb_Output_error,\ define gb_LinkTarget_use_static_external_library
gb_LinkTarget_add_linked_static_external_libs: use gb_LinkTarget_use_static_external_libraries instead.)
endef
# TODO: why do we need this?
define gb_LinkTarget_use_static_external_libraries
$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2) $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call gb_ExternalLibs_get_target,$$(lib))) $(call gb_LinkTarget_get_target,$(1)) : $(call gb_ExternalProject_get_target,$(3))
$(call gb_LinkTarget_get_external_headers_target,$(1)) : $$(foreach lib,$(2),$$(call gb_ExternalLibs_get_target,$$(lib))) $(call gb_LinkTarget_get_external_headers_target,$(1)) : $(call gb_ExternalProject_get_target,$(3))
endef endef