Skip to content

Autotools: Normalize DTrace sources argument #15111

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.

Sign up for GitHub

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
Jul 26, 2024
+14 −6
Merged

Autotools: Normalize DTrace sources argument #15111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion build/php.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2268,6 +2268,11 @@ AS_VAR_IF([php_cv_have_write_stdout], [yes],
dnl
dnl PHP_INIT_DTRACE(providerdesc, header-file, sources [, module])
dnl
dnl Initialize the DTrace support using the DTrace "providerdesc" file and
dnl generate "header-file". The "sources" is a blank-or-newline-separated list
dnl of files. The optional "module" is PHP extension name or path when used in
dnl extensions.
dnl
AC_DEFUN([PHP_INIT_DTRACE],
[AC_CHECK_HEADER([sys/sdt.h],,
[AC_MSG_ERROR([Cannot find sys/sdt.h which is required for DTrace support.])])
Expand Down Expand Up @@ -2306,7 +2311,7 @@ dnl Add providerdesc.o or .lo into global objects when needed.

dnl DTrace objects.
old_IFS=[$]IFS
for ac_src in $3; do
for ac_src in m4_normalize([$3]); do
IFS=.
set $ac_src
ac_obj=[$]1
Expand Down
13 changes: 8 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,11 +1020,14 @@ PHP_ARG_ENABLE([dtrace],
[no])

AS_VAR_IF([PHP_DTRACE], [yes],
[PHP_INIT_DTRACE([Zend/zend_dtrace.d],
[Zend/zend_dtrace_gen.h],
[main/main.c Zend/zend_API.c \
Zend/zend_execute.c Zend/zend_exceptions.c \
Zend/zend_dtrace.c Zend/zend.c])])
[PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h], [
main/main.c
Zend/zend_API.c
Zend/zend_dtrace.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend.c
])])

AC_MSG_CHECKING([how big to make fd sets])
PHP_ARG_ENABLE([fd-setsize],,
Expand Down
Loading