OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac: Redirect grep stdout, stderr to /dev/null instead of grep -q. 

libjava:
	* configure.ac: Redirect grep stdout, stderr to /dev/null instead
	of grep -q.
	Use -- instead of grep -e.
	* configure: Regenerate.

	contrib:
	* dg-extract-results.sh: Redirect grep output to /dev/null instead
	of grep -q.

	Backport from mainline:
	2010-01-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* dg-extract-results.sh: Don't use tail -n.

From-SVN: r159843
This commit is contained in:
Rainer Orth 2010-05-25 20:20:59 +00:00 committed by Rainer Orth
parent 96f75462c3
commit e6683ea946
5 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/ChangeLog
View File

@ -1,3 +1,13 @@
2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* dg-extract-results.sh: Redirect grep output to /dev/null instead
of grep -q.
Backport from mainline:
2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* dg-extract-results.sh: Don't use tail -n.
2010-04-29 Release Manager
* GCC 4.4.4 released.

4
contrib/dg-extract-results.sh
View File

@ -224,7 +224,7 @@ else
VARIANTS=""
for VAR in $VARS
do
grep -q "Running target $VAR" $SUM_FILES && VARIANTS="$VARIANTS $VAR"
grep "Running target $VAR" $SUM_FILES > /dev/null && VARIANTS="$VARIANTS $VAR"
done
fi
@ -418,6 +418,6 @@ cat ${TMP}/var-* | $AWK -f $TOTAL_AWK
# This is ugly, but if there's version output from the compiler under test
# at the end of the file, we want it. The other thing that might be there
# is the final summary counts.
tail -n 2 $FIRST_SUM | grep -q '^#' || tail -n 2 $FIRST_SUM
tail -2 $FIRST_SUM | grep '^#' > /dev/null || tail -2 $FIRST_SUM
exit 0

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac: Redirect grep stdout, stderr to /dev/null instead
of grep -q.
Use -- instead of grep -e.
* configure: Regenerate.
2010-04-29 Jakub Jelinek <jakub@redhat.com>
PR other/43620

4
libjava/configure vendored
View File

@ -28079,8 +28079,8 @@ fi
# Check if linker supports static linking on a per library basis
LD_START_STATIC_SPEC=
LD_FINISH_STATIC_SPEC=
if $LD --help 2>&1 | grep -q -e -call_shared ; then
if $LD --help 2>&1 | grep -q -e -non_shared ; then
if $LD --help 2>&1 | grep -- -call_shared >/dev/null 2>&1; then
if $LD --help 2>&1 | grep -- -non_shared >/dev/null 2>&1; then
LD_START_STATIC_SPEC='%{static-libgcj:-non_shared}'
LD_FINISH_STATIC_SPEC='%{static-libgcj:-call_shared}'
fi

4
libjava/configure.ac
View File

@ -1712,8 +1712,8 @@ AM_CONDITIONAL(ANONVERSCRIPT, test "$libjava_cv_anon_version_script" = yes)
# Check if linker supports static linking on a per library basis
LD_START_STATIC_SPEC=
LD_FINISH_STATIC_SPEC=
if $LD --help 2>&1 | grep -q -e -call_shared ; then
if $LD --help 2>&1 | grep -q -e -non_shared ; then
if $LD --help 2>&1 | grep -- -call_shared >/dev/null 2>&1; then
if $LD --help 2>&1 | grep -- -non_shared >/dev/null 2>&1; then
LD_START_STATIC_SPEC='%{static-libgcj:-non_shared}'
LD_FINISH_STATIC_SPEC='%{static-libgcj:-call_shared}'
fi