diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-11 00:57:51 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-11 00:57:51 +0100 |
| commit | 20bb2dac9e47ac35252f5166f22856f73cd40d5f (patch) | |
| tree | 4297df41b2c3e95fe5f1f435a735c5c2ed05f1f0 /contrib | |
| parent | a88f4804345de28d0e3ea79fb7c1acb28a7fe453 (diff) | |
| parent | 094091958654bae07a9ad53a63fd69468efcd3e3 (diff) | |
| download | gcc-20bb2dac9e47ac35252f5166f22856f73cd40d5f.zip gcc-20bb2dac9e47ac35252f5166f22856f73cd40d5f.tar.gz gcc-20bb2dac9e47ac35252f5166f22856f73cd40d5f.tar.bz2 | |
Merge commit 'ce7a757fd9ecb99c4f54cfde5cf5ef9a9e7819fc^' into HEAD
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 11 | ||||
| -rwxr-xr-x | contrib/gcc_update | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 403a095..fc11bcd 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,14 @@ +2023-09-12 Jonathan Wakely <jwakely@redhat.com> + + PR other/111360 + * gcc_update: Quote variable. + +2023-09-11 Jonathan Wakely <jwakely@redhat.com> + + PR other/111359 + * gcc-git-customization.sh: Check for getent before using it. + Use id on macOS. + 2023-09-07 Tobias Burnus <tobias@codesourcery.com> * gcc-changelog/git_commit.py (GitCommit.__init__, diff --git a/contrib/gcc_update b/contrib/gcc_update index 1d7bfab..cda2bdb 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -343,7 +343,7 @@ case $vcs_type in revision=`$GCC_GIT log -n1 --pretty=tformat:%h` r=`$GCC_GIT describe --all --match 'basepoints/gcc-[0-9]*' HEAD \ | sed -n 's,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)-\([0-9]\+\)-g[0-9a-f]*$,r\2-\3,p;s,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)$,r\2-0,p'`; - if test -n $r; then + if test -n "$r"; then o=`$GCC_GIT config --get gcc-config.upstream`; rr=`echo $r | sed -n 's,^r\([0-9]\+\)-[0-9]\+\(-g[0-9a-f]\+\)\?$,\1,p'`; if $GCC_GIT rev-parse --verify --quiet ${o:-origin}/releases/gcc-$rr >/dev/null; then |