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

Merge branch 'PHP-8.1' into PHP-8.2

Browse source
This commit is contained in:
Ben Ramsey 2023-07-10 09:26:17 -05:00
commit 097b08cbbe
No known key found for this signature in database
GPG key ID: F9C39DC0B9698544
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
build/libtool.m4 vendored
View file

@ -271,7 +271,7 @@ $rm -r conftest*
dnl autoconf 2.13 compatibility dnl autoconf 2.13 compatibility
dnl _LT_AC_TRY_LINK() dnl _LT_AC_TRY_LINK()
AC_DEFUN(_LT_AC_TRY_LINK, [ AC_DEFUN([_LT_AC_TRY_LINK], [
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
dnl This sometimes fails to find confdefs.h, for some reason. dnl This sometimes fails to find confdefs.h, for some reason.
dnl [#]line __oline__ "[$]0" dnl [#]line __oline__ "[$]0"
@ -675,10 +675,9 @@ s390*-*linux*|sparc*-*linux*)
SAVE_CFLAGS="$CFLAGS" SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf" CFLAGS="$CFLAGS -belf"
AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
[AC_LANG_SAVE [AC_LANG_PUSH([C])
AC_LANG_C AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP([C])])
AC_LANG_RESTORE])
if test x"$lt_cv_cc_needs_belf" != x"yes"; then if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS" CFLAGS="$SAVE_CFLAGS"
@ -1197,7 +1196,7 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks"
ln conftest.a conftest.b 2>/dev/null && hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no
AC_MSG_RESULT([$hard_links]) AC_MSG_RESULT([$hard_links])
if test "$hard_links" = no; then if test "$hard_links" = no; then
AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe]) AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
need_locks=warn need_locks=warn
fi fi
else else
@ -1935,15 +1934,15 @@ AC_ARG_WITH([tags],
if test -f "$ltmain" && test -n "$tagnames"; then if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then if test ! -f "${ofile}"; then
AC_MSG_WARN([output file \`$ofile' does not exist]) AC_MSG_WARN([output file '$ofile' does not exist])
fi fi
if test -z "$LTCC"; then if test -z "$LTCC"; then
eval "`$SHELL ${ofile} --config | grep '^LTCC='`" eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
if test -z "$LTCC"; then if test -z "$LTCC"; then
AC_MSG_WARN([output file \`$ofile' does not look like a libtool script]) AC_MSG_WARN([output file '$ofile' does not look like a libtool script])
else else
AC_MSG_WARN([using \`LTCC=$LTCC', extracted from \`$ofile']) AC_MSG_WARN([using 'LTCC=$LTCC', extracted from '$ofile'])
fi fi
fi fi
if test -z "$LTCFLAGS"; then if test -z "$LTCFLAGS"; then
@ -1966,7 +1965,7 @@ if test -f "$ltmain" && test -n "$tagnames"; then
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
then then
AC_MSG_ERROR([tag name \"$tagname\" already exists]) AC_MSG_ERROR([tag name "$tagname" already exists])
fi fi
# Update the list of available tags. # Update the list of available tags.
@ -2738,8 +2737,7 @@ fi
AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
AC_DEFUN([_LT_AC_LANG_C_CONFIG], AC_DEFUN([_LT_AC_LANG_C_CONFIG],
[lt_save_CC="$CC" [lt_save_CC="$CC"
AC_LANG_SAVE AC_LANG_PUSH([C])
AC_LANG_C
# Source file extension for C test sources. # Source file extension for C test sources.
ac_ext=c ac_ext=c
@ -2807,7 +2805,7 @@ AC_MSG_RESULT([$enable_static])
AC_LIBTOOL_CONFIG($1) AC_LIBTOOL_CONFIG($1)
AC_LANG_RESTORE AC_LANG_POP([C])
CC="$lt_save_CC" CC="$lt_save_CC"
])# AC_LIBTOOL_LANG_C_CONFIG ])# AC_LIBTOOL_LANG_C_CONFIG
@ -2819,8 +2817,7 @@ CC="$lt_save_CC"
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_SAVE [AC_LANG_PUSH([C++])
AC_LANG_CPLUSPLUS
AC_REQUIRE([AC_PROG_CXX]) AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([_LT_AC_PROG_CXXCPP]) AC_REQUIRE([_LT_AC_PROG_CXXCPP])
@ -3806,7 +3803,7 @@ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_CONFIG($1) AC_LIBTOOL_CONFIG($1)
AC_LANG_RESTORE AC_LANG_POP([C++])
CC=$lt_save_CC CC=$lt_save_CC
LDCXX=$LD LDCXX=$LD
LD=$lt_save_LD LD=$lt_save_LD

4
configure.ac
View file

@ -128,7 +128,9 @@ PKG_PROG_PKG_CONFIG
AC_PROG_CC([cc gcc]) AC_PROG_CC([cc gcc])
PHP_DETECT_ICC PHP_DETECT_ICC
PHP_DETECT_SUNCC PHP_DETECT_SUNCC
AC_PROG_CC_C99
dnl AC_PROG_CC_C99 is obsolete with autoconf >= 2.70 yet necessary for <= 2.69.
m4_version_prereq([2.70],,[AC_PROG_CC_C99])
AC_PROG_CPP AC_PROG_CPP
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
AC_PROG_LN_S AC_PROG_LN_S