diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-12-18 15:59:51 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-12-18 16:12:56 +0100 |
| commit | d1cf36265d25ddee11e787c4c83692163b66b06b (patch) | |
| tree | 27146ace78509bffcd03f867e8b4b2b57bbbbf6e /solenv | |
| parent | 897f35006ea48b7b60b087a8f0b955c7f099af3a (diff) | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index fc6e6b7efd64..a31400376355 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 |