From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5765 invoked by alias); 31 Aug 2018 14:36:03 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 43358 Received: (qmail 20899 invoked by uid 1010); 31 Aug 2018 14:36:03 -0000 X-Qmail-Scanner-Diagnostics: from park01.gkg.net by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(205.235.26.22):SA:0(-0.8/5.0):. Processed in 0.831469 secs); 31 Aug 2018 14:36:03 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, NML_ADSP_CUSTOM_MED,RCVD_IN_DNSWL_NONE,SPF_PASS,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: SRS0=jHIi=LO=yahoo.co.uk=okiddle@bounces.park01.gkg.net X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | X-Virus-Scanned: by amavisd-new at gkg.net Authentication-Results: amavisd4.gkg.net (amavisd-new); dkim=fail (2048-bit key) reason="fail (body has been altered)" header.d=yahoo.co.uk X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1535726142; bh=P161bFqjbRSQKHGezUYs9UvXVWEXlj+MhSFYqsb3O2o=; h=From:To:Subject:Date:From:Subject; b=swoPARtVbc1ze+hwQvcfNOoohhALHULBjA+wbZaBaN839l3vZmYbB/fAJG6GDOBoZezRnjSvrMh85huWiKKn6dFscRRAjK0eryxTIiiTo1btdkcKab8CrQn5s0qnmPBjNu2uYlFC4wYoGWT12bryuq9CNnDxnHragzRytW5xDCwvHEAzkKFrFIwE5VC0dN4M59Emlis82P8r1XrsYsEE6C5YlEvrfmcegs8WFU5pH3wL/hI5TwjR05PZtQPrc+Pg31UVmyH/UF57C3bzXPAuHZqi9jEATCFc1scnlP0fe0IazHOIV8o2vZyM8WQiyi60g5u7J2EN1w1jILje2yF4Tg== X-YMail-OSG: ejruvY8VM1n7F5uymNlUOf_3jYXOOaM2gyK7RysR0Prh0y2E8nvY5wK7kJLMhsV yqVpH39V_8QQpyt2dxFVN1x10dZxQiCqPGR3MWyvRhr2jUYxr.3VTULxRp55KZe4R812.nuY6Qcp x1AUWhv1W215ryYfDGCSh1vYNIuGfJS8LIV5XVv6HHq.vX2w2O4oBssxpi3Uvjk_qc7xw2ssfgit QR80RRxCDDxKizHqmhhuO4Pf8fz2PrrvMd0EIyzeWFwEPxaTs_XCAFRi.uBvNMg3JVxjwOk5PzVJ PXVSA5A.naQZAIbtLidMdOV.GqenOx5a7h5k9yzL4mWVYlUfo7Xdk17z1XSzRXzTH5G2UFGc9AzG UO5li2Arw3_OSDxQyFx_S.T_c4pwykEM2NkxW2xnj4FntrmmGepP9LdGP_vGNDStiByYttngnFgh 16NdAhIRxSL1ZrECYURl3AOc3vkeEqiq.GY5.ReSQMfrri7YDYlhT0tdx7lJu.71u.wJ6imalMhe _JhndfVZu7AwXNhjryz_86KFOpARV7Gt19GYc523eejmWjLV4Q4kWHt_hYp2LdDvAOZIvCUE7uEK zgQR3t0msujV1YMs2.Fs0dlgdFL2eOEf9rmubNYx7Lo..yh61w5yDXIhijIaYBnL0J8aDNyJmJav pHziNvflSfVI.HZ_V1k4mixhZdluKUNCcJnLazlxB5y6NDVITHOML_iZH1MwmpB9x.zh8FpCJAYI gV06dibzJ0oyb5Ij4QcDSVD3i5kDsA072Q.VbsTq8RsvxoFaxKxPxjO_JKoNl1QYKuG1F6kd6A5r vU4Da8Tn.UX_QtqS242i3OgMXI8p02arwrBR978_3pzuP3PZQjoqBykVeSBQ8..Me5x2Tfj4XCgY ze4ukMxXUTxXyy8oLWgeSNZ7k2tytTpC2TlOe.npWNoc7cQn2C419zNHbh.vVNfMinTkkjKPxa9m s8OYuLZo3UNid9PLYUAtZd882cA.qglz.ZHx4 From: Oliver Kiddle To: Zsh workers Subject: PATCH: dependency of patchlevel.h MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <25961.1535726139.1@hydra> Date: Fri, 31 Aug 2018 16:35:39 +0200 Message-ID: <25962-1535726139.113636@Sr-t.fdMJ.mNaM> In my own builds, I've been finding that make install needs to recompile a few files and that $ZSH_PATCHLEVEL is generally empty. After looking into the cause, it seems to be rather specific to my setup but I include a patch, nevertheless. In the Makefile, we force building patchlevel.h but use cmp to ensure it is only updated when changed. But make install is normally run as root and on my system, root is using an older version of git. The older git outputs a 7 hex-digit hash while more recent git adapts it based on the number of objects in the repository so I get 9 hex-digits. By adding --abbrev=7, we can ensure consistency. Perhaps we should use a bigger value than 7 - any thoughts on that? Currently, there are no duplicates in the first 7 digits for the zsh repository. Also, is there any objection to adding -f to the mv command. Running make install as root tends to result in patchlevel.h being owned by root and then the mv needs to prompt before overwriting it. Oliver diff --git a/Src/zsh.mdd b/Src/zsh.mdd index 324435d62..3e5788af5 100644 --- a/Src/zsh.mdd +++ b/Src/zsh.mdd @@ -53,8 +53,8 @@ patchlevel.h: FORCE @if [ -f $(sdir)/$@.release ]; then \ cp -f $(sdir)/$@.release $@; \ else \ - echo '#define ZSH_PATCHLEVEL "'`cd $(sdir) && git describe --tags --long`'"' > $@.tmp; \ - cmp $@ $@.tmp >/dev/null 2>&1 && rm -f $@.tmp || mv $@.tmp $@; \ + echo '#define ZSH_PATCHLEVEL "'`cd $(sdir) && git describe --tags --long --abbrev=7`'"' > $@.tmp; \ + cmp $@ $@.tmp >/dev/null 2>&1 && rm -f $@.tmp || mv -f $@.tmp $@; \ fi FORCE: