[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 ef1cebd21164df15299b105f5d662f6443ac0e88
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Mar 12 11:45:46 2010 +0200

    Fix Solaris/intel build (bb #1878).

diff --git a/libclamav/c++/configure b/libclamav/c++/configure
index 179c3be..6033a55 100755
--- a/libclamav/c++/configure
+++ b/libclamav/c++/configure
@@ -3783,7 +3783,7 @@ if test "$cxxset" != set; then
 fi
 case "$target_os" in
 solaris*)
-  CXXFLAGS="$CXXFLAGS -include llvm/System/Solaris.h"
+  CXXFLAGS="$CXXFLAGS -include llvm/include/llvm/System/Solaris.h"
   { $as_echo "$as_me:${as_lineno-$LINENO}: Building on Solaris" >&5
 $as_echo "$as_me: Building on Solaris" >&6;}
   ;;
diff --git a/libclamav/c++/configure.ac b/libclamav/c++/configure.ac
index c48bcee..192766b 100644
--- a/libclamav/c++/configure.ac
+++ b/libclamav/c++/configure.ac
@@ -32,7 +32,7 @@ if test "$cxxset" != set; then
 fi
 case "$target_os" in
 solaris*)
-  CXXFLAGS="$CXXFLAGS -include llvm/System/Solaris.h"
+  CXXFLAGS="$CXXFLAGS -include llvm/include/llvm/System/Solaris.h"
   AC_MSG_NOTICE([Building on Solaris])
   ;;
 esac
diff --git a/libclamav/c++/llvm/lib/System/Unix/Process.inc b/libclamav/c++/llvm/lib/System/Unix/Process.inc
index cf6a47a..a85b234 100644
--- a/libclamav/c++/llvm/lib/System/Unix/Process.inc
+++ b/libclamav/c++/llvm/lib/System/Unix/Process.inc
@@ -59,6 +59,8 @@ Process::GetPageSize()
   return static_cast<unsigned>(page_size);
 }
 
+/* ClamAV: we don't link with -lmalloc */
+#undef HAVE_MALLINFO
 size_t Process::GetMallocUsage() {
 #if defined(HAVE_MALLINFO)
   struct mallinfo mi;

-- 
Debian repository for ClamAV