[Libreoffice-commits] core.git: Makefile.fetch

Michael Stahl mstahl at redhat.com
Fri Jan 8 06:14:03 PST 2016


 Makefile.fetch |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f79c760b48965a04c260745fb9a23a6e1086faa
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 8 15:08:32 2016 +0100

    Makefile.fetch: don't use server side time stamps
    
    The wget download apparently uses the time stamp of the file on the
    server by default, which breaks incremental builds.
    
    If wget downloads the file and it does not get the current timestamp at
    the time of download but the one the file happens to have on the server,
    then if you built from the previous version of the tarball at a later
    time than the timestamp of the new tarball, make won't detect that it
    has to unpack the new tarball.
    
    The curl download should not be affected since curl requires an explicit
    -R to use the server side time stamp.
    
    Change-Id: I6bab51d20b8ab5e485fe68d3f27c31aaddc99f68

diff --git a/Makefile.fetch b/Makefile.fetch
index 4816ed6..8d63d25 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -11,7 +11,7 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log
 
 ifneq (,$(WGET))
 define fetch_Download__wget_command
-&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]'
+&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N --no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]'
 endef
 
 else


More information about the Libreoffice-commits mailing list