[Libreoffice-commits] .: 2 commits - solenv/bin solenv/gbuild

[Bjoern Michaelsen]

 solenv/bin/concat-deps.c    |    1 +
 solenv/gbuild/Executable.mk |    2 +-
 solenv/gbuild/Library.mk    |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b8f7cc3c26a95b7dfb41415b24f0e2a3a9f1e33c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Aug 1 18:19:28 2012 +0200

    force depfile concat on deliver
    
    * in some scenarios gcc (or ccache) generate relative paths
    * thus we need to concat the depfiles in the same makerun as the compiles
    * stiil not foolproof:
      - cd sw && make and abort with Ctrl-C
      - cd .. && make sw
      - now we have deps from mixed workdirs
    * in the end we should likely always cd to SRCDIR before all compiles
    
    Change-Id: I007da96f38ed2cfe403b692400f447764f6d6988

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 9f56296..f1d392a 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -55,7 +55,7 @@ define gb_Executable__Executable_impl
 $(call gb_Executable_set_targettype_gui,$(2))
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),Executable)
-$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
+$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(2)) \
 	| $(dir $(call gb_Executable_get_target,$(1))).dir
 $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Executable_Executable_platform,$(1),$(2))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 157be8c..5866b9b 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -74,7 +74,7 @@ $(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_Library_DEFS) \
 )
 $(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
-$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
+$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(2)) \
 	| $(dir $(call gb_Library_get_target,$(1))).dir
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
commit 7917af89eb4901c9ed77c7847bc0e8588685fd83
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Aug 1 18:18:40 2012 +0200

    brown paperbag: set current_path_length too
    
    Change-Id: Ie8e8f0b42b05a7d99fc81ad3a57e661758c12533

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index d2c1d7f..8c9354b 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -890,6 +890,7 @@ struct hash* dep_hash;
         if(current_dir_length == base_dir_length)
         {
             current_dir = base_dir_var;
+            current_dir_length = kBASE_DIR_VAR_LENGTH;
         }
         else
         {