com php-src: Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.: NEWS build/libtool.m4
| From: | Adam Harvey | Date: | Thu, 27 Aug 2015 22:59:59 +0000 |
| Subject: | com php-src: Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.: NEWS build/libtool.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88787@lists.php.net to get a copy of this message | ||
Commit: e872f4d9c1bea82a4e4c8fc203210119aae60609
Author: Adam Harvey <aharvey@php.net> Thu, 27 Aug 2015 15:59:59 -0700
Parents: a5864d9917357f4e68e4edb481ca7e3e71826ba7
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e872f4d9c1bea82a4e4c8fc203210119aae60609
Log:
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).
Bugs:
https://bugs.php.net/70370
Changed paths:
M NEWS
M build/libtool.m4
Diff:
diff --git a/NEWS b/NEWS
index 717cac3..a73fd37 100644
--- a/NEWS
+++ b/NEWS
@@ -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 37dc159..f7f5164 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
;;