Skip to content

Autotools: Normalize PHP_ADD_BUILD_DIR 1st argument #15612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions UPGRADING.INTERNALS
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ PHP 8.4 INTERNALS UPGRADE NOTES
- M4 macro PHP_INSTALL_HEADERS arguments can now be also
blank-or-newline-separated lists instead of only separated with whitespace
or backslash-then-newline.
- M4 macro PHP_ADD_BUILD_DIR now also accepts 1st argument as a
blank-or-newline-separated separated list.
- TSRM/tsrm.m4 file and its TSRM_CHECK_PTHREADS M4 macro have been removed.
- Added pkg-config support to find libpq for the pdo_pgsql and pgsql
extensions. The libpq paths can be customized with the PGSQL_CFLAGS and
Expand Down
15 changes: 9 additions & 6 deletions build/php.m4
Original file line number Diff line number Diff line change
Expand Up @@ -911,12 +911,15 @@ AC_DEFUN([PHP_SELECT_SAPI],[
dnl
dnl PHP_ADD_BUILD_DIR(dirs [, create])
dnl
dnl Add build directories and directories required for the out-of-source builds.
dnl When "create" is given, the provided "dirs" are created immediately upon
dnl macro invocation, instead of deferring it to the PHP_GEN_BUILD_DIRS.
dnl
AC_DEFUN([PHP_ADD_BUILD_DIR],[
ifelse($2,,[BUILD_DIR="$BUILD_DIR $1"], [$php_shtool mkdir -p $1])
dnl Add blank-or-newline-separated list of build directories or directories
dnl required for the out-of-source builds. When "create" is given, the provided
dnl "dirs" are created immediately upon macro invocation, instead of deferring
dnl them to the PHP_GEN_BUILD_DIRS.
dnl
AC_DEFUN([PHP_ADD_BUILD_DIR],
[m4_ifblank([$2],
[AS_VAR_APPEND([BUILD_DIR], [" m4_normalize(m4_expand([$1]))"])],
[$php_shtool mkdir -p m4_normalize(m4_expand([$1]))])
])

dnl
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,7 @@ PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/Zend/Makefile.frag],
AC_DEFINE([HAVE_BUILD_DEFS_H], [1],
[Define to 1 if PHP has the <main/build-defs.h> header file.])

PHP_ADD_BUILD_DIR(m4_normalize([
PHP_ADD_BUILD_DIR([
main
main/streams
scripts
Expand All @@ -1790,7 +1790,7 @@ PHP_ADD_BUILD_DIR(m4_normalize([
Zend
Zend/asm
Zend/Optimizer
]))
])

AC_CONFIG_FILES([
main/build-defs.h
Expand Down
8 changes: 5 additions & 3 deletions ext/dba/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -765,9 +765,11 @@ AS_VAR_IF([HAVE_DBA], [1], [
]),
[$ext_shared],,
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
PHP_ADD_BUILD_DIR([$ext_builddir/libcdb])
PHP_ADD_BUILD_DIR([$ext_builddir/libflatfile])
PHP_ADD_BUILD_DIR([$ext_builddir/libinifile])
PHP_ADD_BUILD_DIR([
$ext_builddir/libcdb
$ext_builddir/libflatfile
$ext_builddir/libinifile
])
PHP_SUBST([DBA_SHARED_LIBADD])
],
[AC_MSG_RESULT([no])])
4 changes: 2 additions & 2 deletions ext/dom/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ if test "$PHP_DOM" != "no"; then
]),
[$ext_shared],,
[$PHP_LEXBOR_CFLAGS])
PHP_ADD_BUILD_DIR(m4_normalize([
PHP_ADD_BUILD_DIR([
$ext_builddir/parentnode
$ext_builddir/$LEXBOR_DIR/core
$ext_builddir/$LEXBOR_DIR/css/selectors
Expand All @@ -242,7 +242,7 @@ if test "$PHP_DOM" != "no"; then
$ext_builddir/$LEXBOR_DIR/ports/posix/lexbor/core
$ext_builddir/$LEXBOR_DIR/selectors-adapted
$ext_builddir/$LEXBOR_DIR/tag
]))
])
PHP_SUBST([DOM_SHARED_LIBADD])
PHP_INSTALL_HEADERS([ext/dom], m4_normalize([
dom_ce.h
Expand Down
4 changes: 2 additions & 2 deletions ext/intl/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if test "$PHP_INTL" != "no"; then
[shared_objects_intl],
[yes])])

PHP_ADD_BUILD_DIR(m4_normalize([
PHP_ADD_BUILD_DIR([
$ext_builddir/breakiterator
$ext_builddir/calendar
$ext_builddir/collator
Expand All @@ -126,7 +126,7 @@ if test "$PHP_INTL" != "no"; then
$ext_builddir/timezone
$ext_builddir/transliterator
$ext_builddir/uchar
]))
])

PHP_ADD_EXTENSION_DEP(intl, date)
fi
6 changes: 4 additions & 2 deletions ext/opcache/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,10 @@ int main(void) {
fi

AS_VAR_IF([PHP_OPCACHE_JIT], [yes], [
PHP_ADD_BUILD_DIR([$ext_builddir/jit])
PHP_ADD_BUILD_DIR([$ext_builddir/jit/ir])
PHP_ADD_BUILD_DIR([
$ext_builddir/jit
$ext_builddir/jit/ir
])
PHP_ADD_MAKEFILE_FRAGMENT([$ext_srcdir/jit/Makefile.frag])
])
PHP_SUBST([OPCACHE_SHARED_LIBADD])
Expand Down
6 changes: 4 additions & 2 deletions sapi/fpm/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,10 @@ if test "$PHP_FPM" != "no"; then
php_fpm_prefix=$(eval echo $prefix)
AC_SUBST([php_fpm_prefix])

PHP_ADD_BUILD_DIR([sapi/fpm/fpm])
PHP_ADD_BUILD_DIR([sapi/fpm/fpm/events])
PHP_ADD_BUILD_DIR([
sapi/fpm/fpm
sapi/fpm/fpm/events
])
AC_CONFIG_FILES([
sapi/fpm/init.d.php-fpm
sapi/fpm/php-fpm.8
Expand Down
Loading