From: Alexandre Oliva <oliva@adacore.com>
Date: Fri, 3 Jun 2022 06:59:01 +0000 (-0300)
Subject: libcody: fix nonportable shell code in revision.stamp build rule
X-Git-Tag: basepoints/gcc-14~6236
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39ab2e4c3921136136cdb08ca5c81bd0c3fe7d73;p=thirdparty%2Fgcc.git

libcody: fix nonportable shell code in revision.stamp build rule

Two non-portable shell constructs have been long present in libcody's
build rule for revision.stamp: $() instead of ``, and += to append to
a shell variable.  The former seems to work even when bash is
operating as /bin/sh, but += doesn't, and it ends up trying to run
revision+=M as a command name, and issuing an error as that command is
(hopefully) not found.

This patch replaces both constructs with more portable ones.


for  libcody/ChangeLog

	* Makefile.in (revision.stamp): Replace $() and += with more
	portable shell constructs.
---

diff --git a/libcody/Makefile.in b/libcody/Makefile.in
index 7eaf8ace8ceb..bb87468cb9a3 100644
--- a/libcody/Makefile.in
+++ b/libcody/Makefile.in
@@ -66,11 +66,11 @@ clean:: Makefile
 
 # FIXME: Delete
 revision.stamp: $(srcdir)/.
-	@revision=$$(git -C $(srcdir) rev-parse HEAD 2>/dev/null) ;\
+	@revision=`git -C $(srcdir) rev-parse HEAD 2>/dev/null` ;\
 	if test -n "$$revision" ;\
 	then revision=git-$$revision ;\
 	  if git -C $(srcdir) status --porcelain 2>/dev/null | grep -vq '^  ' ;\
-	  then revision+=M ;\
+	  then revision=$${revision}M ;\
 	  fi ;\
 	else revision=unknown ;\
 	fi ;\