Skip to content

Commit de63ebf

Browse files
committed
Merge branch 'PHP-5.6'
* PHP-5.6: Fix NEWS indentation. Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
2 parents 0a3f2ca + 4ddc4af commit de63ebf

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ PHP NEWS
1212
. Fixed bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
1313
(Dmitry)
1414
. Fixed bug #70145 (From field incorrectly parsed from headers). (Anatol)
15+
. Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when
16+
building extensions). (Adam)
1517
. Fixed bug causing exception traces with anon classes to be truncated. (Bob)
1618

1719
- Curl:

build/libtool.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1545,7 +1545,7 @@ freebsd* | dragonfly*)
15451545
objformat=`/usr/bin/objformat`
15461546
else
15471547
case $host_os in
1548-
freebsd[[123]]*) objformat=aout ;;
1548+
freebsd[[123]].*) objformat=aout ;;
15491549
*) objformat=elf ;;
15501550
esac
15511551
fi
@@ -3162,7 +3162,7 @@ case $host_os in
31623162
;;
31633163
esac
31643164
;;
3165-
freebsd[[12]]*)
3165+
freebsd[[12]].*)
31663166
# C++ shared libraries reported to be fairly broken before switch to ELF
31673167
_LT_AC_TAGVAR(ld_shlibs, $1)=no
31683168
;;

0 commit comments

Comments
 (0)