You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 00:28:05 UTC
svn commit: r1409549 - in /incubator/ooo/branches/gbuild/main/solenv/gbuild:
CppunitTest.mk Executable.mk Helper.mk Library.mk LinkTarget.mk
platform/linux.mk platform/macosx.mk platform/solaris.mk
platform/windows.mk platform/winmingw.mk
Author: arist
Date: Wed Nov 14 23:28:03 2012
New Revision: 1409549
URL: http://svn.apache.org/viewvc?rev=1409549&view=rev
Log:
gnumake4_050_ee31ca60454d.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1301690975 0
# Node ID ee31ca60454d41eb12342de0f4d5a20f1d61823b
# Parent efb3d33ce8ca41f56053d62c1773c438d09c1153
gnumake4: #i117610#: gbuild: more convenient handling for external libs:
add local variable LIBS to LinkTarget, which is given verbatim to the linker.
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk Wed Nov 14 23:28:03 2012
@@ -91,6 +91,8 @@ $(eval $(foreach method,\
add_api \
add_linked_libs \
add_linked_static_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk Wed Nov 14 23:28:03 2012
@@ -78,6 +78,8 @@ $(eval $(foreach method,\
add_api \
add_linked_libs \
add_linked_static_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk Wed Nov 14 23:28:03 2012
@@ -95,6 +95,7 @@ gb_Helper_REPOSITORYNAMES += $(1)
endef
+# RepositoryExternal.mk is optional
define gb_Helper_add_repository
gb_Helper_CURRENTREPOSITORY :=
include $(1)/Repository.mk
@@ -102,6 +103,7 @@ ifeq ($$(gb_Helper_CURRENTREPOSITORY),)
$$(eval $$(call gb_Output_error,No call to gb_Helper_register_repository in Repository.mk for repository $(1)))
endif
$$(gb_Helper_CURRENTREPOSITORY) := $(1)
+-include $(1)/RepositoryExternal.mk
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk Wed Nov 14 23:28:03 2012
@@ -122,6 +122,8 @@ $(eval $(foreach method,\
add_linked_libs \
add_linked_static_libs \
add_external_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk Wed Nov 14 23:28:03 2012
@@ -353,6 +353,7 @@ $(call gb_LinkTarget_get_target,$(1)) :
$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_LIBS :=
+$(call gb_LinkTarget_get_target,$(1)) : LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE :=
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
@@ -459,6 +460,10 @@ endif
endef
+define gb_LinkTarget_add_libs
+$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
+endef
+
define gb_LinkTarget_add_linked_libs
ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
@@ -681,4 +686,17 @@ endif
endef
+# this forwards to functions that must be defined in RepositoryExternal.mk.
+# $(call gb_LinkTarget_use_external,library,external)
+define gb_LinkTarget_use_external
+$(eval $(if $(value gb_LinkTarget__use_$(2)),\
+ $(call gb_LinkTarget__use_$(2),$(1)),\
+ $(error gb_LinkTarget_use_external: unknown external: $(2))))
+endef
+
+# $(call gb_LinkTarget_use_externals,library,externals)
+gb_LinkTarget_use_externals = \
+ $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external)))
+
+
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk Wed Nov 14 23:28:03 2012
@@ -236,6 +236,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+ $(LIBS) \
-o $(1))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk Wed Nov 14 23:28:03 2012
@@ -274,6 +274,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+ $(LIBS) \
-o $(1) \
`cat $${DYLIB_FILE}` && \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk Wed Nov 14 23:28:03 2012
@@ -213,6 +213,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+ $(LIBS) \
-o $(1))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed Nov 14 23:28:03 2012
@@ -440,6 +440,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
$(patsubst %,%.lib,$(EXTERNAL_LIBS)) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
+ $(LIBS) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk?rev=1409549&r1=1409548&r2=1409549&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk Wed Nov 14 23:28:03 2012
@@ -416,6 +416,7 @@ $(call gb_Helper_abbreviate_dirs_native,
--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
--start-group $(patsubst %,-l%,$(EXTERNAL_LIBS)) --end-group \
+ $(LIBS) \
$(MINGW_CLIB_DIR)/crtend.o \
-Map $(basename $(1)).map \
-o $(1))
@@ -440,6 +441,7 @@ $(call gb_Helper_abbreviate_dirs_native,
@$${RESPONSEFILE} \
--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+ $(LIBS) \
$(MINGW_CLIB_DIR)/crtend.o \
-Map $(basename $(DLLTARGET)).map \
-o $(DLLTARGET) && touch $(1))