[med-svn] [Git][med-team/htslib][master] i386 works!

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / htslib


Commits:
75fe8867 by Michael R. Crusoe at 2019-12-09T18:06:06Z
i386 works!

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+htslib (1.9-12) unstable; urgency=medium
+
+  * Fix for the autopkgtest on i386 means we can re-enable it! (Closes: #942580)
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 09 Dec 2019 19:06:02 +0100
+
 htslib (1.9-11) unstable; urgency=medium
 
   * Install README at request of upstream


=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Vcs-Git: https://salsa.debian.org/med-team/htslib.git
 Homepage: https://github.com/samtools/htslib
 
 Package: libhts2
-Architecture: any-amd64 arm64 armel armhf mips mips64el mipsel ppc64el s390x alpha hppa ia64 m68k powerpc powerpcspe ppc64 riscv64 sh4 sparc64 x32
+Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends},
@@ -39,7 +39,7 @@ Description: C library for high-throughput sequencing data formats
  new index and then for the old if the new index is absent.
 
 Package: libhts-dev
-Architecture: any-amd64 arm64 armel armhf mips mips64el mipsel ppc64el s390x alpha hppa ia64 m68k powerpc powerpcspe ppc64 riscv64 sh4 sparc64 x32
+Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: libhts2 (= ${binary:Version}),
@@ -99,7 +99,7 @@ Description: Test data for HTSlib
  This package contains test files and scripts for the HTSlib.
 
 Package: tabix
-Architecture: any-amd64 arm64 armel armhf mips mips64el mipsel ppc64el s390x alpha hppa ia64 m68k powerpc powerpcspe ppc64 riscv64 sh4 sparc64 x32
+Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: generic indexer for TAB-delimited genome position files


=====================================
debian/tests/run-unit-test
=====================================
@@ -4,16 +4,23 @@ set -e
 pkg="htslib"
 
 if [ "$AUTOPKGTEST_TMP" = "" ] ; then
-  AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+	AUTOPKGTEST_TMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX)
 fi
 
-cp -aL /usr/share/${pkg}-test/* $AUTOPKGTEST_TMP
+cp -aL /usr/share/${pkg}-test/* "$AUTOPKGTEST_TMP"
 
-cd $AUTOPKGTEST_TMP
+cd "$AUTOPKGTEST_TMP"
 
 sed -i 's#\$(HTSPREFIX)#/usr/include/#g' htslib_vars.mk
 sed -i 's#\$(HTSLIB)#/usr/include/#g' htslib.mk
 
-CFLAGS="-O2 -fno-strict-aliasing -fno-code-hoisting" make -e check
+CFLAGS="-O2 -fno-strict-aliasing -fno-code-hoisting"
+
+if grep sse /proc/cpuinfo > /dev/null; then
+	CFLAGS+=" -msse -mfpmath=sse"
+fi
+export CFLAGS
+
+make -e check
 
 echo "PASS"



View it on GitLab: https://salsa.debian.org/med-team/htslib/commit/75fe8867618c3f8f9d1a7ad89dab7b3fbdc5e5de

-- 
View it on GitLab: https://salsa.debian.org/med-team/htslib/commit/75fe8867618c3f8f9d1a7ad89dab7b3fbdc5e5de
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191209/1ff92aa4/attachment-0001.html>