From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
 id 402F53857C78; Tue,  8 Mar 2022 16:48:22 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 402F53857C78
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-7536] contrib: Fix gcc-descr script [PR102664]
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 058d19b42ad4c4c22635f70db6913a80884aedec
X-Git-Newrev: 10ecf5182a0f63d79a44b953483ecfbb54d29bcb
Message-Id: <20220308164822.402F53857C78@sourceware.org>
Date: Tue,  8 Mar 2022 16:48:22 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Mar 2022 16:48:22 -0000

https://gcc.gnu.org/g:10ecf5182a0f63d79a44b953483ecfbb54d29bcb

commit r12-7536-g10ecf5182a0f63d79a44b953483ecfbb54d29bcb
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Mar 8 16:44:17 2022 +0000

    contrib: Fix gcc-descr script [PR102664]
    
    POSIX expr does not support the 'match' keyword, so the git-descr.sh
    scripts should use ':' instead.
    
    contrib/ChangeLog:
    
            PR other/102664
            * git-descr.sh: Use portable form of expr match.

Diff:
---
 contrib/git-descr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/git-descr.sh b/contrib/git-descr.sh
index eb258148a66..ba5d711f330 100755
--- a/contrib/git-descr.sh
+++ b/contrib/git-descr.sh
@@ -23,7 +23,7 @@ elif test x$long = xyes; then
     r=$(git describe --all --abbrev=40 --match 'basepoints/gcc-[0-9]*' $c | sed -n 's,^\(tags/\)\?basepoints/gcc-,r,p')
 else
     r=$(git describe --all --abbrev=14 --match 'basepoints/gcc-[0-9]*' $c | sed -n 's,^\(tags/\)\?basepoints/gcc-,r,p');
-    expr match ${r:-no} 'r[0-9]\+$' >/dev/null && r=${r}-0-g$(git rev-parse $c);
+    expr ${r:-no} : 'r[0-9]\+$' >/dev/null && r=${r}-0-g$(git rev-parse $c);
 fi;
 if test -n $r; then
     o=$(git config --get gcc-config.upstream);