mirror of
https://github.com/php/php-src.git
synced 2024-11-23 09:54:15 +08:00
Fail early in *nix configuration build script
Adding two exit early safeguards in the *nix configuration build script: 1) Given the initial cd into the build tree fails (the project root), the `buildconf` script exits with non-zero status (failure). 2) Given the grep command does not exist or `configure.ac` AC_INIT [1] expectations are unmet, the buildconf script exits non-zero. Additionally quoting the pathname to cd into and the empty CD_PATH parameter for portability, also for systems that are using a non-portable pathname [2] for the build tree. The initial CD safeguard has been applied to the `buildconf` and four more scripts: - build/genif.sh - scripts/dev/credits - scripts/dev/genfiles - scripts/dev/makedist Rationale: Cd-ing into the project root should always prematurely exit w/ FAILURE as a required precondition for its invocation has not been met. This should never go unnoticed as it always requires user intervention. Similar and more specifically to the PHP build on *nix systems, the grep command is required early to obtain the `php_extra_version` from configure.ac. Previously, if the grep command is missing (or failing due to not matching the line with the AC_INIT macro [1]), the internal dev parameter would always be zero (0) which can easily result in the situation that the configure script is not being rebuilt. This is cumbersome as the rebuild of a configure script is more likely required with checked-out dev versions under change rather than an already properly set-up build environment on a dedicated build or release system. Missing the fact that either the grep utility is missing or the expectation of having the AC_INIT macro in configure.ac is unmet should never go unnoticed as it always requires user intervention. [1]: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Initializing-configure.html [2]: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_271 Closes GH-16717.
This commit is contained in:
parent
994e866cf2
commit
c075546320
3
NEWS
3
NEWS
@ -5,6 +5,9 @@ PHP NEWS
|
|||||||
- Calendar:
|
- Calendar:
|
||||||
. Fixed jdtogregorian overflow. (David Carlier)
|
. Fixed jdtogregorian overflow. (David Carlier)
|
||||||
|
|
||||||
|
- Core:
|
||||||
|
. Fail early in *nix configuration build script. (hakre)
|
||||||
|
|
||||||
- FPM:
|
- FPM:
|
||||||
. Fixed GH-16432 (PHP-FPM 8.2 SIGSEGV in fpm_get_status). (Jakub Zelenka)
|
. Fixed GH-16432 (PHP-FPM 8.2 SIGSEGV in fpm_get_status). (Jakub Zelenka)
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ header_list=
|
|||||||
olddir=$(pwd)
|
olddir=$(pwd)
|
||||||
|
|
||||||
# Go to project root.
|
# Go to project root.
|
||||||
cd $(CDPATH= cd -- "$(dirname -- "$0")/../" && pwd -P)
|
cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../" && pwd -P)" || exit
|
||||||
|
|
||||||
module_ptrs="$(echo $extensions | $AWK -f ./build/order_by_dep.awk)"
|
module_ptrs="$(echo $extensions | $AWK -f ./build/order_by_dep.awk)"
|
||||||
|
|
||||||
|
@ -8,9 +8,9 @@ force=0
|
|||||||
debug=0
|
debug=0
|
||||||
|
|
||||||
# Go to project root.
|
# Go to project root.
|
||||||
cd $(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
|
cd "$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd -P)" || exit
|
||||||
|
|
||||||
php_extra_version=$(grep '^AC_INIT(' configure.ac)
|
php_extra_version=$(grep '^AC_INIT(' configure.ac) || exit
|
||||||
case "$php_extra_version" in
|
case "$php_extra_version" in
|
||||||
*-dev*)
|
*-dev*)
|
||||||
dev=1
|
dev=1
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# Generate credits_*.h headers from the ext/*/CREDITS and sapi/*/CREDITS files.
|
# Generate credits_*.h headers from the ext/*/CREDITS and sapi/*/CREDITS files.
|
||||||
|
|
||||||
# Go to project root directory
|
# Go to project root directory
|
||||||
cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
|
cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../../" && pwd -P)" || exit
|
||||||
|
|
||||||
awkprog='
|
awkprog='
|
||||||
BEGIN { FS = "\n|\r\n|\r"; RS = "" }
|
BEGIN { FS = "\n|\r\n|\r"; RS = "" }
|
||||||
|
@ -41,7 +41,7 @@ SED=${SED:-sed}
|
|||||||
MAKE=${MAKE:-make}
|
MAKE=${MAKE:-make}
|
||||||
|
|
||||||
# Go to project root.
|
# Go to project root.
|
||||||
cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
|
cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../../" && pwd -P)" || exit
|
||||||
|
|
||||||
# Check required bison version from the configure.ac file.
|
# Check required bison version from the configure.ac file.
|
||||||
required_bison_version=$($SED -n 's/PHP_PROG_BISON(\[\([0-9\.]*\)\].*/\1/p' configure.ac)
|
required_bison_version=$($SED -n 's/PHP_PROG_BISON(\[\([0-9\.]*\)\].*/\1/p' configure.ac)
|
||||||
|
@ -15,7 +15,7 @@ if [[ $($tar --version) == *"bsdtar"* ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Go to project root directory.
|
# Go to project root directory.
|
||||||
cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
|
cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../../" && pwd -P)" || exit
|
||||||
|
|
||||||
# Process options and arguments.
|
# Process options and arguments.
|
||||||
while :; do
|
while :; do
|
||||||
|
Loading…
Reference in New Issue
Block a user