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-7.4'

Browse source 
* PHP-7.4:
  Fixed bug #78614 (Does not compile with DTRACE anymore)
This commit is contained in:
Dmitry Stogov 2019-10-04 10:10:53 +03:00
commit 3f069b19a0
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/php.m4
View file

@ -2329,7 +2329,7 @@ dnl header-file.
dnl Add providerdesc.o or .lo into global objects when needed. dnl Add providerdesc.o or .lo into global objects when needed.
case $host_alias in case $host_alias in
*freebsd*) *freebsd*)
PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o" PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
PHP_LDFLAGS="$PHP_LDFLAGS -lelf" PHP_LDFLAGS="$PHP_LDFLAGS -lelf"
;; ;;
*solaris*) *solaris*)
@ -2377,7 +2377,7 @@ $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
EOF EOF
case $host_alias in case $host_alias in
*solaris*|*linux*) *solaris*|*linux*|*freebsd*)
dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o" dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o"
dtrace_lib_dir="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs" dtrace_lib_dir="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs"
dtrace_d_obj="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o" dtrace_d_obj="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o"