[FFmpeg-cvslog] configure: fix non-standard regex used with expr

Mans Rullgard git
Tue Feb 15 00:59:10 CET 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Feb 13 21:00:03 2011 +0000| [e0099fdaacdcbe758c1fca3111de5f4c5ebccc01] | committer: Michael Niedermayer

configure: fix non-standard regex used with expr

The colon operator of expr always anchors the pattern at the start
of the string.  An explicit ^ in the pattern has unspecified
behaviour, so remove it.

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 3ad464bfc7df6d0f68c7df9c907089b84d92ab75)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0099fdaacdcbe758c1fca3111de5f4c5ebccc01
---

 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 7b9c5a4..7af0e85 100755
--- a/configure
+++ b/configure
@@ -1868,7 +1868,7 @@ elif $cc -v 2>&1 | grep -qi ^gcc; then
     cc_version=__VERSION__
     gcc_version=$($cc --version | head -n1)
     gcc_basever=$($cc -dumpversion)
-    gcc_pkg_ver=$(expr "$gcc_version" : '^[^ ]* \(([^)]*)\)')
+    gcc_pkg_ver=$(expr "$gcc_version" : '[^ ]* \(([^)]*)\)')
     gcc_ext_ver=$(expr "$gcc_version" : ".*$gcc_pkg_ver $gcc_basever \\(.*\\)")
     cc_ident=$(cleanws "gcc $gcc_basever $gcc_pkg_ver $gcc_ext_ver")
     if ! $cc -dumpversion | grep -q '^2\.'; then




More information about the ffmpeg-cvslog mailing list