diff options
| author | Adam Harvey <aharvey@php.net> | 2015-08-27 16:01:33 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2015-08-27 16:01:33 -0700 |
| commit | de63ebf5f4b23493e17a40d1eb3bdf479c27464f (patch) | |
| tree | 8bb0e482d4c9b9518d6fd718a0d0a54cb7bdc25f | |
| parent | 0a3f2caa6c78cc721ecb1649ce22a536a028f2f9 (diff) | |
| parent | 4ddc4af87c0744eafc3f11e64098553881620dae (diff) | |
| download | php-git-de63ebf5f4b23493e17a40d1eb3bdf479c27464f.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix NEWS indentation.
Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | build/libtool.m4 | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -12,6 +12,8 @@ PHP NEWS . Fixed bug #70187 (Notice: unserialize(): Unexpected end of serialized data) (Dmitry) . Fixed bug #70145 (From field incorrectly parsed from headers). (Anatol) + . Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when + building extensions). (Adam) . Fixed bug causing exception traces with anon classes to be truncated. (Bob) - Curl: 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 ;; |