diff options
author | Adam Harvey <aharvey@php.net> | 2015-08-27 15:59:59 -0700 |
---|---|---|
committer | Adam Harvey <aharvey@php.net> | 2015-08-27 15:59:59 -0700 |
commit | e872f4d9c1bea82a4e4c8fc203210119aae60609 (patch) | |
tree | d217f65de66f7876154e1eb95e82f3b10eb5afed | |
parent | a5864d9917357f4e68e4edb481ca7e3e71826ba7 (diff) | |
download | php-git-e872f4d9c1bea82a4e4c8fc203210119aae60609.tar.gz |
Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
Fixes bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when building
extensions).
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | build/libtool.m4 | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2015, PHP 5.6.14 +- Core: + . Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when + building extensions). (Adam) + - OpenSSL: . Fixed bug #55259 (openssl extension does not get the DH parameters from DH key resource). (Jakub Zelenka) diff --git a/build/libtool.m4 b/build/libtool.m4 index 37dc159882..f7f5164292 100644 --- a/build/libtool.m4 +++ b/build/libtool.m4 @@ -1545,7 +1545,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[123]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3162,7 +3162,7 @@ case $host_os in ;; esac ;; - freebsd[[12]]*) + freebsd[[12]].*) # C++ shared libraries reported to be fairly broken before switch to ELF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; |