RepositoryExternal.mk | 9 +--------
liborcus/ExternalProject_liborcus.mk | 2 +-
solenv/gbuild/LinkTarget.mk | 14 ++++----------
3 files changed, 6 insertions(+), 19 deletions(-)
New commits:
commit c83d82e71b7c792190489529f15957eed31f60e0
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Sep 11 15:38:52 2012 +0200
fix few problems with gbuildized liborcus
Change-Id: Ic8717085f0f71470eadc225eb062c1dee24d24f7
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 42213d9..3e0a650 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1909,19 +1909,12 @@ endef
else # !SYSTEM_LIBORCUS
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- orcus \
-))
-
define gb_LinkTarget__use_orcus
-$(call gb_LinkTarget_use_unpacked,$(1),orcus)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,orcus/include) \
$$(INCLUDE) \
)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
- orcus \
-)
+$(call gb_LinkTarget_use_static_external_library,$(1),orcus,liborcus)
endef
endif # SYSTEM_LIBORCUS
diff --git a/liborcus/ExternalProject_liborcus.mk
b/liborcus/ExternalProject_liborcus.mk
index 80d3876..8cac314 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
&& $(GNUMAKE) \
&& 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 $@
endif
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 955b13d..7d54809 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -745,18 +745,12 @@ $$(foreach lib,$(2),$$(call
gb_StaticLibrary_get_headers_target,$$(lib)))
endef
-define gb_LinkTarget_add_linked_static_external_libs
-$$(call gb_Output_error,\
- 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
-
+# gb_LinkTarget_use_static_external_library linktarget library externalproject
+define gb_LinkTarget_use_static_external_library
$(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_external_headers_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)) : $(call
gb_ExternalProject_get_target,$(3))
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
