[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 303c6ea0167329d8a3bbde56e9de8f4359133e57
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Dec 14 16:21:23 2009 +0200

    Minimum required version for multithreaded LLVM is gcc 4.1.3.
    
    gcc 3.4.6 doesn't support atomic builtins required by LLVM for multithreaded
    mode.
    So make the minimum version 4.1.3, since: 4.0 is buggy for ClamAV itself, and
    4.1.1, 4.1.2 are buggy when compiling LLVM.
    On gcc 3.4.6 clamav will use the interpreter now.

diff --git a/libclamav/c++/bytecode2llvm.cpp b/libclamav/c++/bytecode2llvm.cpp
index eabb80d..75929b9 100644
--- a/libclamav/c++/bytecode2llvm.cpp
+++ b/libclamav/c++/bytecode2llvm.cpp
@@ -59,7 +59,7 @@
 #include <new>
 
 #include "llvm/Config/config.h"
-#ifndef LLVM_MULTITHREADED
+#if !defined(LLVM_MULTITHREADED) || !LLVM_MULTITHREADED
 #error "Multithreading support must be available to LLVM!"
 #endif
 
diff --git a/libclamav/c++/configure b/libclamav/c++/configure
index 62a0043..c61efe2 100755
--- a/libclamav/c++/configure
+++ b/libclamav/c++/configure
@@ -14488,10 +14488,10 @@ $as_echo_n "checking for supported C++ compiler version... " >&6; }
     gxx_version=`${CXX} -dumpversion` ||
     as_fn_error "Unable to get GNU C++ compiler version" "$LINENO" 5
     case "${gxx_version}" in
-     [012].*|3.[0123].*)
+     [0123].*)
 	as_fn_error "C++ compiler too old (${gxx_version})" "$LINENO" 5
         ;;
-     3.4.[012]*|4.0.1*|4.1.[12]*)
+     4.0.1*|4.1.[12]*)
         as_fn_error "C++ compiler is buggy" "$LINENO" 5
         ;;
      *)
diff --git a/libclamav/c++/configure.ac b/libclamav/c++/configure.ac
index e637c55..5afc07f 100644
--- a/libclamav/c++/configure.ac
+++ b/libclamav/c++/configure.ac
@@ -78,10 +78,10 @@ if test "$enable_llvm" = "auto"; then
     gxx_version=`${CXX} -dumpversion` ||
     AC_MSG_ERROR([Unable to get GNU C++ compiler version])
     case "${gxx_version}" in
-     [[012]].*|3.[[0123]].*)
+     [[0123]].*)
 	AC_MSG_ERROR([C++ compiler too old (${gxx_version})])
         ;;
-     3.4.[[012]]*|4.0.1*|4.1.[[12]]*)
+     4.0.1*|4.1.[[12]]*)
         AC_MSG_ERROR([C++ compiler is buggy])
         ;;
      *)

-- 
Debian repository for ClamAV