From d016434ad33284dfaceb8d233351d34356566d7d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 24 Nov 2020 15:26:40 +0100 Subject: [PATCH] Fixed bug #80393 Handle macos versions that don't start with 10.* in libtool. Patch by kir dot morozov at gmail dot com. --- NEWS | 2 ++ build/libtool.m4 | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index d7e369fd2b..b68c93a9da 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,8 @@ PHP NEWS . Fixed bug #72964 (White space not unfolded for CC/Bcc headers). (cmb) . Fixed bug #80362 (Running dtrace scripts can cause php to crash). (al at coralnet dot name) + . 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 099a879935..1faed63a8c 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 ;; @@ -1521,7 +1521,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' ;; @@ -5799,7 +5799,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 -- 2.40.0