[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 a0cbf9adc2e25283872824f4353fae6386e8e2ea
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Sep 30 19:43:21 2009 +0300

    Only use -fno-strict-aliasing for gcc-4.3+, to avoid bugs with older compilers (bb #1581).

diff --git a/ChangeLog b/ChangeLog
index d93fdf2..f44cac4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 30 19:41:43 EEST 2009 (edwin)
+-------------------------------------
+ * configure{.in,}: Only use -fno-strict-aliasing for gcc-4.3+ to avoid bugs
+    with older compilers (bb #1581)
+
 Wed Sep 30 17:15:05 CEST 2009 (tk)
 ----------------------------------
  * libclamav/matcher-bm.c: fix cli_bm_freeoff() (bb#1710)
diff --git a/configure b/configure
index a9abb5f..69455ab 100755
--- a/configure
+++ b/configure
@@ -12757,9 +12757,15 @@ $as_echo "no (${gcc_version})" >&6; }
 $as_echo "ok (${gcc_version})" >&6; }
 				;;
 		esac
-		# bb #1581 - temporarely add -fno-strict-aliasing so gcc 4.4.0
-		# works correctly
-		CFLAGS="$CFLAGS -fno-strict-aliasing"
+		case "${gcc_version}" in
+		    [56789].* | 4.[3456789].*)
+			# bb #1581 - temporarely add -fno-strict-aliasing so gcc 4.4.0
+			# works correctly
+			CFLAGS="$CFLAGS -fno-strict-aliasing"
+			;;
+		    *)
+			;;
+		esac
 	fi
 else
 	CFLAGS="$CFLAGS -O0"
diff --git a/configure.in b/configure.in
index 739a8e6..e1f6ef3 100644
--- a/configure.in
+++ b/configure.in
@@ -102,9 +102,15 @@ if test "$gcc_check" = "yes"; then
 				AC_MSG_RESULT([ok (${gcc_version})])
 				;;
 		esac
-		# bb #1581 - temporarely add -fno-strict-aliasing so gcc 4.4.0
-		# works correctly
-		CFLAGS="$CFLAGS -fno-strict-aliasing"
+		case "${gcc_version}" in
+		    [[56789]].* | 4.[[3456789]].*)
+			# bb #1581 - temporarely add -fno-strict-aliasing so gcc 4.4.0
+			# works correctly
+			CFLAGS="$CFLAGS -fno-strict-aliasing"
+			;;
+		    *)
+			;;
+		esac
 	fi
 else
 	CFLAGS="$CFLAGS -O0"

-- 
Debian repository for ClamAV