[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - solenv/gbuild

[Christian Lohmaier]

 solenv/gbuild/Extension.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4ddd39181a9bc75eb63e47903a4c7b23eb3ab6bd
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Dec 18 15:59:51 2014 +0100

    avoid exceeding commandline limits
    
    don't use "zip -@" to read from stdin, as that expects one file per line
    also zip doesn't like the dos-lineend, so strip that using tr
    
    Change-Id: Ib5c9040a66390119aa7a46225f2d0c8f635bf39a
    (cherry picked from commit d1cf36265d25ddee11e787c4c83692163b66b06b)
    Reviewed-on: https://gerrit.libreoffice.org/13526
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index fc6e6b7..a314003 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -104,9 +104,10 @@ $(call gb_Extension_get_target,%) : \
 		$(if $(LICENSE),cp -f $(LICENSE) $(call gb_Extension_get_rootdir,$*)/registration &&) \
 		$(if $(and $(gb_Extension_TRANS_LANGS),$(DESCRIPTION)),cp $(foreach lang,$(gb_Extension_TRANS_LANGS),$(call gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call gb_Extension_get_rootdir,$*) &&) \
 		cd $(call gb_Extension_get_rootdir,$*) && \
+		ZIPFILES=$(call var2file,$(shell $(gb_MKTEMP)),500,$(sort $(FILES))) && \
 		$(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \
 			$(call gb_Extension_get_target,$*) \
-			$(sort $(FILES)))
+			`cat $${ZIPFILES} | tr -d '\r'` && rm $${ZIPFILES})
 
 # set file list and location of manifest and description files
 # register target and clean target