scp2/AutoInstall.mk | 2 +-
solenv/gbuild/LinkTarget.mk | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit bb9f5c9a514cbadc371aeeed2f0d909d009eeba5
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jun 9 12:41:53 2014 +0200
scp2: kde module wants to install executables now
Change-Id: I573a48a96061e0d8b30c8e15fb9235df68c4f4e5
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index e66a705..4176039 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -17,7 +17,7 @@ $(eval $(call
gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
$(eval $(call
gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
$(eval $(call
gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
commit 7ea6e5412d067001da4ab5a45aeb0ce8d58cdbad
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jun 9 12:15:36 2014 +0200
gbuild: avoid leaving invalid .d files behind if build interrupted
The LinkTarget command builds the LinkTarget's dep-file as well as an
optimization so the next make does not restart; in this case the
dep-file is not the target so it will not be deleted by make in case the
build is interrupted, and the next make can choke on the partially
written .d file.
Change-Id: I13b1884f1a974b7ce10b00e1df1d0f30222f4790
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 773aa3f..6f51b42 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -457,7 +457,8 @@ endef
define gb_LinkTarget__command_impl
$(if $(gb_FULLDEPS),\
$(if $(findstring concat-deps,$(2)),,\
- $(call gb_LinkTarget__command_dep,$(call
gb_LinkTarget_get_dep_target,$(2)),$(2))))
+ $(call gb_LinkTarget__command_dep,$(call
gb_LinkTarget_get_dep_target,$(2)).tmp,$(2)) \
+ mv $(call gb_LinkTarget_get_dep_target,$(2)).tmp $(call
gb_LinkTarget_get_dep_target,$(2))))
$(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call
gb_Library__get_workdir_linktargetname,$(lib)))),\
$(if $(filter $(true),$(call
gb_LinkTarget__is_build_lib,$(2))),\
$(call gb_LinkTarget__command,$(1),$(2)),\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
