Skip to content

Commit 257387b

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fail early in *nix configuration build script
2 parents 3a1a205 + 11da498 commit 257387b

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ PHP NEWS
55
- Calendar:
66
. Fixed jdtogregorian overflow. (David Carlier)
77

8+
- Core:
9+
. Fail early in *nix configuration build script. (hakre)
10+
811
- Curl:
912
. Fixed bug GH-16723 (CURLMOPT_PUSHFUNCTION issues). (cmb)
1013

build/genif.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ header_list=
3232
olddir=$(pwd)
3333

3434
# Go to project root.
35-
cd $(CDPATH= cd -- "$(dirname -- "$0")/../" && pwd -P)
35+
cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../" && pwd -P)" || exit
3636

3737
module_ptrs="$(echo $extensions | $AWK -f ./build/order_by_dep.awk)"
3838

buildconf

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ force=0
88
debug=0
99

1010
# Go to project root.
11-
cd $(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
11+
cd "$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd -P)" || exit
1212

13-
php_extra_version=$(grep '^AC_INIT(' configure.ac)
13+
php_extra_version=$(grep '^AC_INIT(' configure.ac) || exit
1414
case "$php_extra_version" in
1515
*-dev*)
1616
dev=1

scripts/dev/credits

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Generate credits_*.h headers from the ext/*/CREDITS and sapi/*/CREDITS files.
44

55
# Go to project root directory
6-
cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
6+
cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../../" && pwd -P)" || exit
77

88
awkprog='
99
BEGIN { FS = "\n|\r\n|\r"; RS = "" }

scripts/dev/genfiles

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ SED=${SED:-sed}
4242
MAKE=${MAKE:-make}
4343

4444
# Go to project root.
45-
cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
45+
cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../../" && pwd -P)" || exit
4646

4747
# Check required bison version from the configure.ac file.
4848
required_bison_version=$($SED -n 's/PHP_PROG_BISON(\[\([0-9\.]*\)\].*/\1/p' configure.ac)

scripts/dev/makedist

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [[ $($tar --version) == *"bsdtar"* ]]; then
2323
fi
2424

2525
# Go to project root directory.
26-
cd $(CDPATH= cd -- "$(dirname -- "$0")/../../" && pwd -P)
26+
cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../../" && pwd -P)" || exit
2727

2828
# Process options and arguments.
2929
while :; do

0 commit comments

Comments
 (0)