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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 9a62d6f3cbd8aa59646605017b009f9c995a4977
Author: Michael Tautschnig <mt at debian.org>
Date:   Tue Apr 28 12:30:43 2009 +0200

    EF_ALIGNMENT=8 does the trick on ia64, sparc
    
    - Not ignoring errors in make check anymore on ia64, sparc
    - Still no way on alpha, even EF_ALIGNMENT=16 doesn't help

diff --git a/debian/changelog b/debian/changelog
index 2f687fc..cb41ddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 clamav (0.95.1+dfsg-3) unstable; urgency=low
+  
+  [ Michael Tautschnig ]
+  * Unignored make check results on ia64, sparc (alpha still broken): tell
+    electric-fence that the alignment is at least 8 bytes (thanks Aurelien
+    Jarno).
 
+  [ Stephen Gran ]
   * Fix wrong variable useage in milter init script
 
- -- Stephen Gran <sgran at debian.org>  Fri, 24 Apr 2009 23:21:59 +0100
+ -- Stephen Gran <sgran at debian.org>  Tue, 28 Apr 2009 12:30:07 +0200
 
 clamav (0.95.1+dfsg-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index d47649f..3e0a04c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,12 +114,16 @@ endif
 check:
 	dh_testdir
 ifeq ($(with_check),yes)
-ifneq (,$(filter alpha ia64 sparc, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
-	@echo "Ignoring errors because of #521737, #521556, #521688"
+ifneq (,$(filter alpha, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
+	@echo "Ignoring errors because of #521737"
 	-$(MAKE) check
 else
+ifneq (,$(filter ia64 sparc, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
+	$(MAKE) check EF_ALIGNMENT=8
+else
 	$(MAKE) check
 endif
+endif
 else
 	@echo "Testsuite not run: $(with_check)."
 endif

-- 
Debian repository for ClamAV