From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 5 Aug 2010 22:40:55 +0000 (+0200)
Subject: Work around a nasty bug (segfault) of Solaris make.
X-Git-Tag: v1.11.1b~65^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7aa360a4eb92708375957b5fe192deb66ce7f52;p=thirdparty%2Fautomake.git

Work around a nasty bug (segfault) of Solaris make.

* lib/am/check.am (recheck, recheck-html): Trim trailing spaces
from $list, to avoid triggering a nasty bug (potential segfault)
on Solaris make.
---

diff --git a/ChangeLog b/ChangeLog
index de7124d16..0bac5d1d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	Work around a nasty bug (segfault) of Solaris make.
+	* lib/am/check.am (recheck, recheck-html): Trim trailing spaces
+	from $list, to avoid triggering a nasty bug (potential segfault)
+	on Solaris make.
+
 2010-08-06  Peter Rosin  <peda@lysator.liu.se>
 
 	Make cond5.test more robust on MSYS.
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 1401eb9fe..3d2807211 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -442,6 +442,7 @@ recheck recheck-html:
 	          case $$line in FAIL*|XPASS*) echo $$f;; esac;		\
 	        else echo $$f; fi;					\
 	      done | tr '\012\015' '  '`;				\
+	list=`echo "$$list" | sed 's/ *$$//'`;				\
 	$(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) TEST_LOGS="'"$$list"'"'
 .pl.log:
 	@p='$<'; $(am__check_pre) $(PL_LOG_COMPILE) "$$tst" $(am__check_post)
diff --git a/lib/am/check.am b/lib/am/check.am
index 755bf13ab..e51939111 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -291,6 +291,9 @@ recheck recheck-html:
 	          case $$line in FAIL*|XPASS*) echo $$f;; esac;		\
 	        else echo $$f; fi;					\
 	      done | tr '\012\015' '  '`;				\
+## This apparently useless munging helps to avoid a nasty bug (a
+## segmentation fault!) on Solaris XPG4 make.
+	list=`echo "$$list" | sed 's/ *$$//'`;				\
 	$(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) TEST_LOGS="'"$$list"'"'
 
 .PHONY: recheck recheck-html
diff --git a/tests/Makefile.in b/tests/Makefile.in
index b2e63aebe..1c7f21ba8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1217,6 +1217,7 @@ recheck recheck-html:
 	          case $$line in FAIL*|XPASS*) echo $$f;; esac;		\
 	        else echo $$f; fi;					\
 	      done | tr '\012\015' '  '`;				\
+	list=`echo "$$list" | sed 's/ *$$//'`;				\
 	$(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) TEST_LOGS="'"$$list"'"'
 .test.log:
 	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)