[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild
solenv/gbuild/Library.mk|7 +-- solenv/gbuild/LinkTarget.mk | 12 2 files changed, 13 insertions(+), 6 deletions(-) New commits: commit fc4181678c72b891ae6fe909409ba486c26a6f1e Author: David Tardon Date: Sun Sep 16 19:50:15 2012 +0200 SOVERSION is used by LinkTarget, so set it there Relying on inheritance of variables by prerequisites may cause all sorts of weird problems, e.g., an executable being linked with -Wl,--soname=... just because a library with explicitly set soname happened to depend on it. I wonder if we should make most of the target-specific variables private Change-Id: Id337ace462973e7af12e62414b81739e3e873d96 diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 157be8c..38a9bac 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -62,7 +62,6 @@ $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk endif $(call gb_Library_get_target,$(1)) : AUXTARGETS := $(call gb_Library_get_target,$(1)) : SOVERSION := -$(call gb_Library_get_target,$(1)) : SOVERSIONSCRIPT := $(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1))) endef @@ -84,15 +83,11 @@ $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_L endef define gb_Library__set_soversion_script -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \ - $(3) +$(call gb_LinkTarget_set_soversion_script,$(call gb_Library_get_linktargetname,$(1)),$(2),$(3)) $(call gb_Library_get_target,$(1)) : SOVERSION := $(2) -$(call gb_Library_get_target,$(1)) : SOVERSIONSCRIPT := $(3) $(call gb_Library_get_target,$(1)) \ $(call gb_Library_get_clean_target,$(1)) : \ AUXTARGETS += $(call gb_Library_get_target,$(1)).$(2) -$(call gb_LinkTarget_add_auxtargets,$(call gb_Library_get_linktargetname,$(1)),\ - $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))).$(2)) endef # for libraries that maintain stable ABI: set SOVERSION and version script diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 7599597..4d9dea0 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -491,6 +491,8 @@ $(call gb_LinkTarget_get_target,$(1)) : PDBFILE := $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS := $(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS := +$(call gb_LinkTarget_get_target,$(1)) : SOVERSION := +$(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT := ifeq ($(gb_FULLDEPS),$(true)) -include $(call gb_LinkTarget_get_dep_target,$(1)) @@ -514,10 +516,20 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 := $(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS := $(call gb_LinkTarget_get_dep_target,$(1)) : WARNINGS_NOT_ERRORS := +$(call gb_LinkTarget_get_dep_target,$(1)) : SOVERSION := +$(call gb_LinkTarget_get_dep_target,$(1)) : SOVERSIONSCRIPT := endif endef +define gb_LinkTarget_set_soversion_script +$(call gb_LinkTarget_get_target,$(1)) : $(3) +$(call gb_LinkTarget_get_target,$(1)) : SOVERSION := $(2) +$(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT := $(3) +$(call gb_LinkTarget_add_auxtargets,$(1),$(call gb_LinkTarget_get_target,$(1)).$(2)) + +endef + define gb_LinkTarget_add_defs $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 484920848b0fda115921a66104bfde4bcceca10e Author: Matúš Kukan Date: Tue Aug 7 18:13:52 2012 +0200 fix typo in previous commit Change-Id: Icdb862929730a92b02e3c3753a077902abe66eba diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 5d3116e..978fcf4 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -236,7 +236,7 @@ define gb_create_deps endef endif -gb_COMPILER_LTOFLAGS := $(filter TRUE,$(ENABLE_LTO),-GL) +gb_COMPILER_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL) # Helper class ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |8 1 file changed, 8 insertions(+) New commits: commit 5eb068449b287d32fe73975a6313c626184414fd Author: Matúš Kukan Date: Sun Aug 5 21:29:20 2012 +0200 honour --enable-lto on windows too Change-Id: I78637034d9fdd4a5528fe1e9c9bc752086954526 diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 8b03099..5d3116e 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -236,6 +236,8 @@ define gb_create_deps endef endif +gb_COMPILER_LTOFLAGS := $(filter TRUE,$(ENABLE_LTO),-GL) + # Helper class gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin @@ -268,6 +270,7 @@ $(call gb_Helper_abbreviate_dirs,\ unset INCLUDE && \ $(gb_CC) \ $(DEFS) \ + $(if $(filter Library,$(TARGETTYPE)),$(gb_COMPILER_LTOFLAGS)) \ $(T_CFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ -Fd$(PDBFILE) \ @@ -289,6 +292,7 @@ $(call gb_Helper_abbreviate_dirs,\ unset INCLUDE && \ $(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \ $(DEFS) \ + $(if $(filter Library,$(TARGETTYPE)),$(gb_COMPILER_LTOFLAGS)) \ $(T_CXXFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \ -Fd$(PDBFILE) \ @@ -379,6 +383,10 @@ gb_Library_TARGETTYPEFLAGS := \ -DLL \ $(gb_Windows_PE_TARGETTYPEFLAGS) +ifeq ($(ENABLE_LTO),TRUE) +gb_Library_TARGETTYPEFLAGS += -LTCG +endif + gb_Library_get_rpath := gb_Library_SYSPRE := i ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild
solenv/gbuild/CliLibrary.mk |5 +++-- solenv/gbuild/CliNativeLibrary.mk |2 +- solenv/gbuild/Helper.mk |5 + 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 5fae3213d72702e38d00a501e4e91d1f163fc867 Author: Matúš Kukan Date: Mon Aug 6 16:40:24 2012 +0200 get cli_ure closer to successful build Change-Id: I28ba1f4e802b3736a9f82966a2c7908388df4a92 diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 62c9d78..bf2c88c 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -36,14 +36,15 @@ gb_CliLibraryTarget__get_generated_source = $(WORKDIR)/$(1).cs define gb_CliLibraryTarget__command $(call gb_Output_announce,$(2),$(true),CSC,3) $(call gb_Helper_abbreviate_dirs,\ - csc \ + csc $(call gb_Helper_windows_path, \ $(call gb_CliLibraryTarget__get_csflags) \ $(CLI_CSCFLAGS) \ -target:library \ -out:$(1) \ -reference:System.dll \ - $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly).dll) \ + $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly)) \ $(CLI_SOURCES) \ + ) \ ) endef diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk index 5751cc8..a11c1d1 100644 --- a/solenv/gbuild/CliNativeLibrary.mk +++ b/solenv/gbuild/CliNativeLibrary.mk @@ -35,7 +35,7 @@ $(call gb_CliNativeLibraryTarget_get_target,%) : $(call gb_CliNativeLibraryTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),SN ,4) $(call gb_Helper_abbreviate_dirs,\ - rm -r $(call gb_CliNativeLibraryTarget_get_target,$*) \ + rm -rf $(call gb_CliNativeLibraryTarget_get_target,$*) \ ) define gb_CliNativeLibraryTarget_CliNativeLibraryTarget diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 93a0ad7..b83ecbe 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -55,6 +55,11 @@ define gb_Helper_native_path $(call gb_Output_error,gb_Helper_native_path: Do not use. Should not be necessary.) endef +# cygwin seems to eat one backslash when executing command, thus replace with '\\' +define gb_Helper_windows_path +$(subst /,\\,$(1)) +endef + define gb_Helper_make_clean_target gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild
solenv/gbuild/UnoApiTarget.mk |1 + 1 file changed, 1 insertion(+) New commits: commit be91742ceaa09e18b788a79c46d45f754851c96c Author: Matúš Kukan Date: Sun Aug 5 15:17:52 2012 +0200 gbuild: add missing dependency on regmerge visible with 'make udkapi.all' Change-Id: I7fcd72e4d6849e3457551d85d507a15f6f72077b diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 64c49b6..49219a5 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -222,6 +222,7 @@ endef define gb_UnoApiTarget_add_idlfiles $(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl))) $(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3)) +$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGETARGET) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
