Skip to content

Commit ae6e56f

Browse files
committed
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Fixed bug #80393
2 parents bf24475 + d016434 commit ae6e56f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ PHP NEWS
77
(cmb)
88
. Fixed bug #72964 (White space not unfolded for CC/Bcc headers). (cmb)
99
. Fixed bug #80391 (Iterable not covariant to mixed). (Nikita)
10+
. Fixed bug #80393 (Build of PHP extension fails due to configuration gap
11+
with libtool). (kir dot morozov at gmail dot com)
1012

1113
- Fileinfo:
1214
. Fixed bug #77961 (finfo_open crafted magic parsing SIGABRT). (cmb)

build/libtool.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
340340
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
341341
10.[[012]]*)
342342
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
343-
10.*)
343+
*)
344344
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
345345
esac
346346
;;
@@ -1522,7 +1522,7 @@ darwin* | rhapsody*)
15221522
shlibpath_var=DYLD_LIBRARY_PATH
15231523
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
15241524
ifelse([$1], [],[
1525-
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
1525+
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
15261526
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
15271527
;;
15281528
@@ -5800,7 +5800,7 @@ _LT_EOF
58005800
10.[[012]])
58015801
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
58025802
;;
5803-
10.*)
5803+
*)
58045804
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
58055805
;;
58065806
esac

0 commit comments

Comments
 (0)