From: Adam Harvey <aharvey@php.net>
Date: Thu, 27 Aug 2015 22:59:59 +0000 (-0700)
Subject: Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
X-Git-Tag: php-5.6.14RC1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e872f4d9c1bea82a4e4c8fc203210119aae60609;p=php

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).
---

diff --git a/NEWS b/NEWS
index 717cac3abb..a73fd3766c 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 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
     ;;