[FFmpeg-cvslog] configure: report full gcc version string

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


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Feb 13 13:17:46 2011 +0000| [48e05567390ca98b3cfe0dec171e28f458765698] | committer: Michael Niedermayer

configure: report full gcc version string

This makes the cc_ident value, which is used in FATE reports, include
all interesting parts of the gcc version string.

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

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

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

diff --git a/configure b/configure
index 238bf01..7b9c5a4 100755
--- a/configure
+++ b/configure
@@ -1866,8 +1866,11 @@ if   $cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
 elif $cc -v 2>&1 | grep -qi ^gcc; then
     cc_type=gcc
     cc_version=__VERSION__
-    gcc_extra_ver=$(expr "$($cc --version | head -n1)" : '.*\((.*)\)')
-    cc_ident="gcc $($cc -dumpversion) $gcc_extra_ver"
+    gcc_version=$($cc --version | head -n1)
+    gcc_basever=$($cc -dumpversion)
+    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
         CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
         AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'




More information about the ffmpeg-cvslog mailing list