archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Fail early in *nix configuration build script
This commit is contained in:
Christoph M. Becker 2024-11-09 14:06:18 +01:00
commit 257387b9e5
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
6 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -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)
- Curl: - Curl:
. Fixed bug GH-16723 (CURLMOPT_PUSHFUNCTION issues). (cmb) . Fixed bug GH-16723 (CURLMOPT_PUSHFUNCTION issues). (cmb)

2
build/genif.sh
View file

@ -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)"

4
buildconf
View file

@ -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

2
scripts/dev/credits
View file

@ -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 = "" }

2
scripts/dev/genfiles
View file

@ -42,7 +42,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)

2
scripts/dev/makedist
View file

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