diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-20 09:51:22 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-20 09:51:22 +0200 |
commit | 0dc15e188558bdb3df201fc71d0a67ba0bb1eeb9 (patch) | |
tree | 634c3aac0d7910adb713b719f437388277e8022f /build | |
parent | b9d8e5d706e36b7e8bb8bdd26bc93374fd9a6020 (diff) | |
parent | 1b936033b00cd223984122e6fad2cedf8e72f3f5 (diff) | |
download | php-git-0dc15e188558bdb3df201fc71d0a67ba0bb1eeb9.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Fix #77041: buildconf should output error messages to stderr
Diffstat (limited to 'build')
-rwxr-xr-x | build/buildcheck.sh | 12 | ||||
-rw-r--r-- | build/genif.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 54881459a1..12a6b0eaed 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -31,16 +31,16 @@ fi # autoconf 2.64 or newer ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` if test -z "$ac_version"; then -echo "buildconf: autoconf not found." -echo " You need autoconf version 2.64 or newer installed" -echo " to build PHP from Git." +echo "buildconf: autoconf not found." >&2 +echo " You need autoconf version 2.64 or newer installed" >&2 +echo " to build PHP from Git." >&2 exit 1 fi IFS=.; set $ac_version; IFS=' ' if test "$1" = "2" -a "$2" -lt "64" || test "$1" -lt "2"; then -echo "buildconf: autoconf version $ac_version found." -echo " You need autoconf version 2.64 or newer installed" -echo " to build PHP from Git." +echo "buildconf: autoconf version $ac_version found." >&2 +echo " You need autoconf version 2.64 or newer installed" >&2 +echo " to build PHP from Git." >&2 exit 1 else echo "buildconf: autoconf version $ac_version (ok)" diff --git a/build/genif.sh b/build/genif.sh index 4a9c0faee7..c150c4c40a 100644 --- a/build/genif.sh +++ b/build/genif.sh @@ -13,7 +13,7 @@ awk=$1 shift if test -z "$infile" || test -z "$srcdir"; then - echo "please supply infile and srcdir" + echo "please supply infile and srcdir" >&2 exit 1 fi |