diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-24 15:27:35 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-24 15:27:43 +0100 |
| commit | ae6e56fb98aec9a874298938fdb41e74898b6084 (patch) | |
| tree | 0cf3dba6157e94fca0dbc485ba833f5a7ed44671 | |
| parent | bf244757eeaf9940928b044faebeb20d7f677844 (diff) | |
| parent | d016434ad33284dfaceb8d233351d34356566d7d (diff) | |
| download | php-git-ae6e56fb98aec9a874298938fdb41e74898b6084.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fixed bug #80393
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | build/libtool.m4 | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -7,6 +7,8 @@ PHP NEWS (cmb) . Fixed bug #72964 (White space not unfolded for CC/Bcc headers). (cmb) . Fixed bug #80391 (Iterable not covariant to mixed). (Nikita) + . Fixed bug #80393 (Build of PHP extension fails due to configuration gap + with libtool). (kir dot morozov at gmail dot com) - Fileinfo: . Fixed bug #77961 (finfo_open crafted magic parsing SIGABRT). (cmb) diff --git a/build/libtool.m4 b/build/libtool.m4 index 97cd79029e..e69603679d 100644 --- a/build/libtool.m4 +++ b/build/libtool.m4 @@ -340,7 +340,7 @@ AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 10.[[012]]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) + *) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -1522,7 +1522,7 @@ darwin* | rhapsody*) shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ifelse([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -5800,7 +5800,7 @@ _LT_EOF 10.[[012]]) _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) + *) _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ;; esac |