offapi/UnoApi_offapi.mk | 2 +-
offapi/UnoApi_types.mk | 2 +-
oovbaapi/UnoApi_oovbaapi.mk | 2 +-
solenv/gbuild/UnoApiTarget.mk | 5 -----
solenv/gbuild/platform/unxgcc.mk | 2 ++
udkapi/UnoApi_udkapi.mk | 2 +-
udkapi/UnoApi_uretypes.mk | 2 +-
7 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 55bebb553dbbcf69c3b0d5d72033a5146c813fcf
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Oct 25 14:18:59 2011 +0200
add -Wl,--export-dynamic for executables on unxgcc platforms
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 01421da..ecff556 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -328,6 +328,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
$(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
@@ -440,6 +441,7 @@ gb_StaticLibrary_StaticLibrary_platform =
# Executable class
+gb_Library_TARGETTYPEFLAGS := -Wl,--export-dynamic
gb_Executable_EXT :=
gb_Executable_LAYER := \
commit 2cffbfab9cd80c44b7b13bbfb56eee721eeadf94
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Oct 25 02:22:28 2011 +0200
kill multi repo support for UnoApiTarget
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 1f3ab32..8ae72cb 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi))
$(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\
udkapi \
diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApi_types.mk
index 02b9953..df0da06 100644
--- a/offapi/UnoApi_types.mk
+++ b/offapi/UnoApi_types.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,types,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
udkapi \
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index c204aa6..340c5d0 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi))
$(eval $(call gb_UnoApiTarget_add_rdbfiles,oovbaapi,\
udkapi \
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 816fb85..e4d1785 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -35,7 +35,6 @@ $(call gb_Package_get_target,$(1)_inc) : $(call
gb_UnoApiTarget_get_target,$(1))
endef
-# TODO: make multi repo safe
define gb_UnoApiTarget_autopackage_idl
$$(eval $$(call gb_Package_Package,$(1)_idl,$(SRCDIR)))
$(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \
@@ -47,10 +46,6 @@ $(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call
gb_UnoApiTarget_get_ta
mkdir -p $$(dir $$@)
define gb_UnoApiTarget_UnoApiTarget
-$(if $(filter $(2),$(gb_Helper_REPOSITORYNAMES)),,\
- $(error UnoApiTarget: no or invalid repository given; known repositories: \
- $(gb_Helper_REPOSITORYNAMES)))
-gb_UnoApiTarget_REPO_$(1) := $(2)
$$(eval $$(call gb_Module_register_target,$(call
gb_UnoApiOutTarget_get_target,$(1)),$(call
gb_UnoApiOutTarget_get_clean_target,$(1))))
$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call
gb_UnoApiTarget_get_target,$(1))
$(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call
gb_UnoApiTarget_get_clean_target,$(1))
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 1572c13..fb1ac94 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi))
$(eval $(call gb_UnoApiTarget_set_include,udkapi,\
$$(INCLUDE) \
diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApi_uretypes.mk
index ad5c8f1..d61d079 100644
--- a/udkapi/UnoApi_uretypes.mk
+++ b/udkapi/UnoApi_uretypes.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types))
$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\
udkapi \
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
