mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3'

Browse Source 
* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77041: buildconf should output error messages to stderr
This commit is contained in:
Peter Kokot 2018-10-20 09:55:33 +02:00
commit 82f59a9682
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/buildcheck.sh
View File

@ -28,16 +28,16 @@ fi
# autoconf 2.68 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.68 or newer installed"
echo " to build PHP from Git."
echo "buildconf: autoconf not found." >&2
echo " You need autoconf version 2.68 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 "68" || test "$1" -lt "2"; then
echo "buildconf: autoconf version $ac_version found."
echo " You need autoconf version 2.68 or newer installed"
echo " to build PHP from Git."
echo "buildconf: autoconf version $ac_version found." >&2
echo " You need autoconf version 2.68 or newer installed" >&2
echo " to build PHP from Git." >&2
exit 1
else
echo "buildconf: autoconf version $ac_version (ok)"

2
build/genif.sh
View File

@ -12,7 +12,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

4
buildconf
View File

@ -27,8 +27,8 @@ while test $# -gt 0; do
done
if test "$dev" = "0" -a "$devok" = "0"; then
echo "You should not run buildconf in a release package."
echo "use buildconf --force to override this check."
echo "You should not run buildconf in a release package." >&2
echo "use buildconf --force to override this check." >&2
exit 1
fi

4
makedist
View File

@ -65,8 +65,8 @@ DIR=php-$VER
DIRPATH=$MY_OLDPWD/$DIR
if test -d "$DIRPATH"; then
echo "The directory $DIR"
echo "already exists, rename or remove it and run makedist again."
echo "The directory $DIR" >&2
echo "already exists, rename or remove it and run makedist again." >&2
exit 1
fi