Skip to content

Commit b7cef2b

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: [ci skip] Update NEWS [ci skip] Update NEWS Fix #77041: buildconf should output error messages to stderr
2 parents 2224277 + 3b8be22 commit b7cef2b

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

build/buildcheck.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ fi
2828
# autoconf 2.68 or newer
2929
ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
3030
if test -z "$ac_version"; then
31-
echo "buildconf: autoconf not found."
32-
echo " You need autoconf version 2.68 or newer installed"
33-
echo " to build PHP from Git."
31+
echo "buildconf: autoconf not found." >&2
32+
echo " You need autoconf version 2.68 or newer installed" >&2
33+
echo " to build PHP from Git." >&2
3434
exit 1
3535
fi
3636
IFS=.; set $ac_version; IFS=' '
3737
if test "$1" = "2" -a "$2" -lt "68" || test "$1" -lt "2"; then
38-
echo "buildconf: autoconf version $ac_version found."
39-
echo " You need autoconf version 2.68 or newer installed"
40-
echo " to build PHP from Git."
38+
echo "buildconf: autoconf version $ac_version found." >&2
39+
echo " You need autoconf version 2.68 or newer installed" >&2
40+
echo " to build PHP from Git." >&2
4141
exit 1
4242
else
4343
echo "buildconf: autoconf version $ac_version (ok)"

build/genif.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ awk=$1
1212
shift
1313

1414
if test -z "$infile" || test -z "$srcdir"; then
15-
echo "please supply infile and srcdir"
15+
echo "please supply infile and srcdir" >&2
1616
exit 1
1717
fi
1818

buildconf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ while test $# -gt 0; do
2727
done
2828

2929
if test "$dev" = "0" -a "$devok" = "0"; then
30-
echo "You should not run buildconf in a release package."
31-
echo "use buildconf --force to override this check."
30+
echo "You should not run buildconf in a release package." >&2
31+
echo "use buildconf --force to override this check." >&2
3232
exit 1
3333
fi
3434

makedist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ DIR=php-$VER
6565
DIRPATH=$MY_OLDPWD/$DIR
6666

6767
if test -d "$DIRPATH"; then
68-
echo "The directory $DIR"
69-
echo "already exists, rename or remove it and run makedist again."
68+
echo "The directory $DIR" >&2
69+
echo "already exists, rename or remove it and run makedist again." >&2
7070
exit 1
7171
fi
7272

0 commit comments

Comments
 (0)