[Libreoffice-commits] .: solenv/inc

Tomáš Chvátal tchvatal at kemper.freedesktop.org
Mon May 14 09:15:59 PDT 2012


 solenv/inc/tg_ext.mk |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 904763b1134bdd84a4e64de1e037da5cac192f27
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Mon May 14 18:11:11 2012 +0200

    Support unpacking xz files.
    
    Change-Id: If0b7234ede1d9f8c59e5df692b45539a508d8921

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 9a25d7a..453a17b 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -113,6 +113,16 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
     @$(RENAME) $@.$(INPATH) $@
 
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.xz
+    @-$(RM) $@
+.IF "$(GUI)"=="UNX"
+    @noop $(assign UNPACKCMD := sh -c "xz -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.xz $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
+.ELSE			# "$(GUI)"=="UNX"
+    @noop $(assign UNPACKCMD := xz -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.xz $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
+.ENDIF			# "$(GUI)"=="UNX"
+    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
+    @$(RENAME) $@.$(INPATH) $@
+
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z
     @-$(RM) $@
 .IF "$(GUI)"=="UNX"


More information about the Libreoffice-commits mailing list