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

Autotools: Move auto_cflags marker to PHP_INIT_BUILD_SYSTEM (#15487)

Browse source 
The "hacky" auto_cflags variable is otherwise set only for the Oracle
Developer Studio compiler (which is at this point also non-usable) and
perhaps might be removed in the future but this is for now moved to the
PHP_INIT_BUILD_SYSTEM for consistent settings between the php-src build
and phpize.

The PHP_INIT_BUILD_SYSTEM is now also called sooner in phpize to match
the php-src build.
This commit is contained in:
Peter Kokot 2024-08-19 22:29:20 +02:00 • committed by GitHub
parent b6d7c011b8
commit 40217b2ea4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
build/php.m4
View file

@ -128,10 +128,20 @@ AC_DEFUN([PHP_INIT_BUILD_SYSTEM],
php_shtool=$srcdir/build/shtool php_shtool=$srcdir/build/shtool
T_MD=$($php_shtool echo -n -e %B) T_MD=$($php_shtool echo -n -e %B)
T_ME=$($php_shtool echo -n -e %b) T_ME=$($php_shtool echo -n -e %b)
dnl Create empty Makefile placeholders.
> Makefile.objects > Makefile.objects
> Makefile.fragments > Makefile.fragments
dnl Mark whether the CFLAGS are set to automatic default value by Autoconf, or
dnl they are manually modified by the environment variable from outside. E.g.
dnl './configure CFLAGS=...'. Set this before the AC_PROG_CC, where Autoconf
dnl adjusts the CFLAGS variable, so the checks can modify CFLAGS.
AS_VAR_IF([CFLAGS],, [auto_cflags=1])
dnl Required programs. dnl Required programs.
PHP_PROG_AWK PHP_PROG_AWK
dnl Run at the end of the configuration, before creating the config.status. dnl Run at the end of the configuration, before creating the config.status.
AC_CONFIG_COMMANDS_PRE( AC_CONFIG_COMMANDS_PRE(
[dnl Directory for storing shared objects of extensions. [dnl Directory for storing shared objects of extensions.

3
configure.ac
View file

@ -100,9 +100,6 @@ dnl ----------------------------------------------------------------------------
PHP_INIT_BUILD_SYSTEM PHP_INIT_BUILD_SYSTEM
dnl We want this one before the checks, so the checks can modify CFLAGS.
AS_VAR_IF([CFLAGS],, [auto_cflags=1])
abs_srcdir=`(cd $srcdir; pwd)` abs_srcdir=`(cd $srcdir; pwd)`
abs_builddir=`pwd` abs_builddir=`pwd`

4
scripts/phpize.m4
View file

@ -26,7 +26,7 @@ AC_DEFUN([PHP_ALWAYS_SHARED],[
test "[$]$1" = "no" && $1=yes test "[$]$1" = "no" && $1=yes
])dnl ])dnl
AS_VAR_IF([CFLAGS],, [auto_cflags=1]) PHP_INIT_BUILD_SYSTEM
abs_srcdir=`(cd $srcdir && pwd)` abs_srcdir=`(cd $srcdir && pwd)`
abs_builddir=`pwd` abs_builddir=`pwd`
@ -65,8 +65,6 @@ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
AS_VAR_IF([prefix],, AS_VAR_IF([prefix],,
[AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])]) [AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])])
PHP_INIT_BUILD_SYSTEM
AC_MSG_CHECKING([for PHP prefix]) AC_MSG_CHECKING([for PHP prefix])
AC_MSG_RESULT([$prefix]) AC_MSG_RESULT([$prefix])
AC_MSG_CHECKING([for PHP includes]) AC_MSG_CHECKING([for PHP includes])