[committed] contrib: Fix gcc-descr script [PR102664]
Jonathan Wakely
jwakely@redhat.com
Tue Mar 8 16:48:37 GMT 2022
Pushed to trunk.
-- >8 --
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.
---
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);
--
2.34.1
More information about the Libstdc++
mailing list