[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
Török Edvin
edwin at clamav.net
Sun Apr 4 01:10:39 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit aee2f7243653cafa8a161bb4690d134d91015412
Author: Török Edvin <edwin at clamav.net>
Date: Mon Dec 7 19:10:51 2009 +0200
Fix compiler version check for C++: autoconf needs [] to be escaped.
Also sync unit tests with compiler.
diff --git a/libclamav/c++/configure b/libclamav/c++/configure
index fc7db50..b6e7139 100755
--- a/libclamav/c++/configure
+++ b/libclamav/c++/configure
@@ -14482,21 +14482,30 @@ ac_configure_args=`echo $new_args | sed -e 's/-Werror //g'`
echo "$ac_configure_args"
if test "$enable_llvm" = "auto"; then
- gxx_version=`${CXX} -dumpversion` ||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported C++ compiler version" >&5
+$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.*)
+ [012].*|3.[0123].*)
as_fn_error "C++ compiler too old (${gxx_version})" "$LINENO" 5
;;
- 3.4.012*|4.0.1*|4.1.12*)
+ 3.4.[012]*|4.0.1*|4.1.[12]*)
as_fn_error "C++ compiler is buggy" "$LINENO" 5
;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (\"{$gxx_version}\")" >&5
+$as_echo "ok (\"{$gxx_version}\")" >&6; }
esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported OS" >&5
+$as_echo_n "checking for supported OS... " >&6; }
case "$target_cpu" in
i?86|amd64|x86_64|powerpc*)
case "$target_os" in
darwin*|freebsd*|openbsd*|netbsd*|dragonfly*|linux*|solaris*|win32*|mingw*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking ok (\"$target_cpu-$target-os\")" >&5
+$as_echo_n "checking ok (\"$target_cpu-$target-os\")... " >&6; }
;;
*)
as_fn_error "OS is not supported, not building LLVM" "$LINENO" 5
diff --git a/libclamav/c++/configure.ac b/libclamav/c++/configure.ac
index de371e5..d62cddd 100644
--- a/libclamav/c++/configure.ac
+++ b/libclamav/c++/configure.ac
@@ -74,21 +74,26 @@ if test "$enable_llvm" = "auto"; then
dnl Do some sanity checks, and don't automatically build on platforms
dnl that are not supported or have broken compilers.
dnl The user can override this by specifying --enable-llvm=yes.
+ AC_MSG_CHECKING([for supported C++ compiler version])
gxx_version=`${CXX} -dumpversion` ||
AC_MSG_ERROR([Unable to get GNU C++ compiler version])
case "${gxx_version}" in
- [012].*|3.[0123].*)
+ [[012]].*|3.[[0123]].*)
AC_MSG_ERROR([C++ compiler too old (${gxx_version})])
;;
- 3.4.[012]*|4.0.1*|4.1.[12]*)
+ 3.4.[[012]]*|4.0.1*|4.1.[[12]]*)
AC_MSG_ERROR([C++ compiler is buggy])
;;
+ *)
+ AC_MSG_RESULT([ok ("{$gxx_version}")])
esac
+ AC_MSG_CHECKING([for supported OS])
case "$target_cpu" in
i?86|amd64|x86_64|powerpc*)
case "$target_os" in
darwin*|freebsd*|openbsd*|netbsd*|dragonfly*|linux*|solaris*|win32*|mingw*)
+ AC_MSG_CHECKING([ok ("$target_cpu-$target-os")])
;;
*)
AC_MSG_ERROR([OS is not supported, not building LLVM])
diff --git a/unit_tests/input/apicalls.cbc b/unit_tests/input/apicalls.cbc
index 52d1cfb..5bb31b0 100644
--- a/unit_tests/input/apicalls.cbc
+++ b/unit_tests/input/apicalls.cbc
@@ -1,6 +1,6 @@
ClamBCaa`|``````|`agafp`clamcoincidencejb
-Tedaa`acb`bb`bb`b
+Tedaaa`aacb`bb`bb`b
Eabaaabbfd|afdgefcgdgac``
G``
A`b`bLacb`b`aa`b`b`Fadaa
diff --git a/unit_tests/input/apicalls2.cbc b/unit_tests/input/apicalls2.cbc
index d1bc79b..6d795b8 100644
--- a/unit_tests/input/apicalls2.cbc
+++ b/unit_tests/input/apicalls2.cbc
@@ -1,6 +1,6 @@
ClamBCaa`|``````|`akafp`clamcoincidencejb
-Tedcabjdebjdaa`acb`bbjdb`bacb`bb`bb`bebed
+Tedcaabjdebjdaaa`aacb`bbjdb`baacb`bb`bb`bebed
Eababaabhd|afdgefcgdg`c``abbid|afdgefcgdgac``
G``
A`b`bLahbedabfd```b`b`aa`b`b`aa`b`b`Fajac
diff --git a/unit_tests/input/arith.cbc b/unit_tests/input/arith.cbc
index 27ccfad..d1c4914 100644
--- a/unit_tests/input/arith.cbc
+++ b/unit_tests/input/arith.cbc
@@ -1,6 +1,6 @@
ClamBCaa`|``````|`afbbep`clamcoincidencejb
-Tedaa`
+Tedaaa`
E``
G``
A`b`bLbabb`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`b`Fbbbaa
diff --git a/unit_tests/input/div0.cbc b/unit_tests/input/div0.cbc
index d720b7f..fb948a7 100644
--- a/unit_tests/input/div0.cbc
+++ b/unit_tests/input/div0.cbc
@@ -1,6 +1,6 @@
ClamBCaa`|``````|`afabp`clamcoincidencejb
-Tedaa`
+Tedaaa`
E``
G``
A`b`bLaab`b`Fabaa
diff --git a/unit_tests/input/lsig.cbc b/unit_tests/input/lsig.cbc
index 6c17475..ee43601 100644
--- a/unit_tests/input/lsig.cbc
+++ b/unit_tests/input/lsig.cbc
@@ -1,8 +1,8 @@
ClamBCaa`|``c``a```|`bjaabp`clamcoincidencejb
-Trojan.Foo.{A,B};Target:2;(((0|1|2)=42,2)|(3=10));EP+0:aabb;ffff;aaccee;f00d;dead
-Tedebieebheebgeebfeebeeebdeebbeebaeebadebcdaa`acb`bbadb`bdb`db`bcjbadbcebadbcebadbcebadbcebadbcecab`bdagahdaeahdajahdabbaddabahdakah
+Trojan.Foo.{A,B};Target:1;(((0|1|2)=42,2)|(3=10));EP+0:aabb;ffff;aaccee;f00d;dead
+Tedebieebheebgeebfeebeeebdeebbeebaeebadebcdaaa`aacb`bbadb`bdb`db`bcajbadbcebadbcebadbcebadbcebadbcecaab`bdagahdaeahdajahdabbaddabahdakah
Eafaaafb`e|amcgefdgfgifbgegcgnfafmfef``
-Gd```hbhabieBdeBbgBofBjfBafBnfBnbBfdBofBof@`bheBad@`bheBbd@`bge at Aa@Ab`b`aAb`b`aC``a`bfeBedB`eBkbB`cBjcBafBafBbfBbf@`beeBffBffBffBff@`beeBffB`cB`cBdf@`bdeBafBafBcfBcfBefBef@`beeBdfBefBafBdf@`bbe at Af@@AgAa at AhAc@AiAb at AjAd`bad at Aa`bad at Ab`bad at Af`bad at Ag`bad at Ah`bad at Ai`bad at Aj`bcdAdD```h`bcdAcD```h`bcdAbD```h`bcdAaD```h`bcd at D```h`
+Gd```hbhabieBdeBbgBofBjfBafBnfBnbBfdBofBof@`bheBad@`bheBbd@`bge at Aa@Ab`b`aAa`b`aC``a`bfeBedB`eBkbB`cBjcBafBafBbfBbf@`beeBffBffBffBff@`beeBffB`cB`cBdf@`bdeBafBafBcfBcfBefBef@`beeBdfBefBafBdf@`bbe at Af@@AgAa at AhAc@AiAb at AjAd`bad at Aa`bad at Ab`bad at Af`bad at Ag`bad at Ah`bad at Ai`bad at Aj`bcdAdD```h`bcdAcD```h`bcdAbD```h`bcdAaD```h`bcd at D```h`
A`b`bLaeb`b`aa`aa`bad`b`b`Fahac
Bb`b`gbBca`aaaagab`b`AadTaaaaaaab
Baaabeab`b`AbdbadacoaabAl`Am`b`badabbafac at dTcab`b at d
diff --git a/unit_tests/input/retmagic.cbc b/unit_tests/input/retmagic.cbc
index bc3b8b1..d0fb843 100644
--- a/unit_tests/input/retmagic.cbc
+++ b/unit_tests/input/retmagic.cbc
@@ -1,6 +1,6 @@
ClamBCaa`|``````|`afaap`clamcoincidencejb
-Tedaa`
+Tedaaa`
E``
G``
A`b`bL`Faaaa
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list