Skip to content

Commit 3ded328

Browse files
committed
Fixed bug #78614 (Does not compile with DTRACE anymore)
1 parent 74ca3a5 commit 3ded328

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.4.0RC4
44

5+
- Core:
6+
. Fixed bug #78614 (Does not compile with DTRACE anymore).
7+
(tz at FreeBSD dot org)
8+
59
- Pcntl:
610
. Fixed bug #77335 (PHP is preventing SIGALRM from specifying SA_RESTART).
711
(Nikita)

build/php.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2326,7 +2326,7 @@ dnl header-file.
23262326
dnl Add providerdesc.o or .lo into global objects when needed.
23272327
case $host_alias in
23282328
*freebsd*)
2329-
PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
2329+
PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
23302330
PHP_LDFLAGS="$PHP_LDFLAGS -lelf"
23312331
;;
23322332
*solaris*)
@@ -2374,7 +2374,7 @@ $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
23742374
EOF
23752375
23762376
case $host_alias in
2377-
*solaris*|*linux*)
2377+
*solaris*|*linux*|*freebsd*)
23782378
dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o"
23792379
dtrace_lib_dir="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs"
23802380
dtrace_d_obj="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o"

0 commit comments

Comments
 (0)