[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

Herbert Dürr hdu at apache.org
Thu Jun 19 03:10:09 PDT 2014


 solenv/inc/tg_ext.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 563d895d861c04adb2e18a18d1b54276bfe65a7a
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Jun 19 08:34:18 2014 +0000

    #i125121# speed up the "make writeable" step when building external libraries
    
    avoiding the many individual invocations of chmod for each directory makes
    this step about ten times faster on Windows without SSD (460sec -> 41sec
    for boost alone). With SSD storage the speedup should be even higher.

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 290b503..ab3a519 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -164,8 +164,7 @@ $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE
     @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
     $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
     @echo make writeable...
-    @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
-    @cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \;
+    @cd $(PACKAGE_DIR) && chmod -R +rwX $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
 
 #add new files to patch
 $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy")


More information about the Libreoffice-commits mailing list