[med-svn] [Git][med-team/hyphy][master] 3 commits: Fix arch independent build issue

[Michael R. Crusoe]

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


Commits:
28b34300 by Michael R. Crusoe at 2021-01-31T11:04:59+01:00
Fix arch independent build issue

which cause the amd64 autopkgtests to fail.

- - - - -
e3fb0dda by Michael R. Crusoe at 2021-01-31T11:41:32+01:00
On amd64, run the build-time tests the SIMD varients that are supported by the build-time CPU.

- - - - -
8cb707d2 by Michael R. Crusoe at 2021-01-31T11:41:32+01:00
release 2.5.27+dfsg-4

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+hyphy (2.5.27+dfsg-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fix arch independent build issue which cause the amd64 autopkgtests to
+    fail.
+  * On amd64, run the build-time tests the SIMD varients that are supported by
+    the build-time CPU.
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Sun, 31 Jan 2021 11:05:20 +0100
+
 hyphy (2.5.27+dfsg-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -20,8 +20,8 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 ifeq (amd64,$(DEB_HOST_ARCH))
 	dh_auto_configure -- -DINSTALL_PREFIX=/usr -DNOAVX=ON -DNOSSE3=ON
-	dh_auto_configure --builddirectory obj_avx -- -DINSTALL_PREFIX=/usr -DNOAVX=OFF -DNOSSE3=OFF
-	dh_auto_configure --builddirectory obj_sse3 -- -DINSTALL_PREFIX=/usr -DNOAVX=ON -DNOSSE3=OFF
+	dh_auto_configure --builddirectory obj-avx -- -DINSTALL_PREFIX=/usr -DNOAVX=OFF -DNOSSE3=OFF
+	dh_auto_configure --builddirectory obj-sse3 -- -DINSTALL_PREFIX=/usr -DNOAVX=ON -DNOSSE3=OFF
 else
 	dh_auto_configure -- -DINSTALL_PREFIX=/usr -DNOAVX=ON -DNOSSE3=ON
 endif
@@ -35,8 +35,8 @@ override_dh_auto_build:
 	; done
 ifeq (amd64,$(DEB_HOST_ARCH))
 	dh_auto_build -- MP MPI
-	dh_auto_build --builddirectory obj_avx -- MP MPI
-	dh_auto_build --builddirectory obj_sse3 -- MP MPI
+	dh_auto_build --builddirectory obj-avx -- MP MPI
+	dh_auto_build --builddirectory obj-sse3 -- MP MPI
 else
 	dh_auto_build -- MP MPI
 endif
@@ -46,11 +46,10 @@ override_dh_install-arch:
 ifeq (amd64,$(DEB_HOST_ARCH))
 	mkdir -p debian/hyphy-mpi/usr/lib/$(DEB_SOURCE)/bin
 	mkdir -p debian/hyphy-pt/usr/lib/$(DEB_SOURCE)/bin
-	cp obj_avx/HYPHYMPI debian/hyphy-mpi/usr/lib/$(DEB_SOURCE)/bin/HYPHYMPI-avx
-	cp obj_sse3/HYPHYMPI debian/hyphy-mpi/usr/lib/$(DEB_SOURCE)/bin/HYPHYMPI-sse3
-	cp obj_avx/hyphy debian/hyphy-pt/usr/lib/$(DEB_SOURCE)/bin/hyphy-avx
-	cp obj_sse3/hyphy debian/hyphy-pt/usr/lib/$(DEB_SOURCE)/bin/hyphy-sse3
-	dh_install -phyphy-common debian/bin/simd-dispatch /usr/lib/$(DEB_SOURCE)/bin
+	cp obj-avx/HYPHYMPI debian/hyphy-mpi/usr/lib/$(DEB_SOURCE)/bin/HYPHYMPI-avx
+	cp obj-sse3/HYPHYMPI debian/hyphy-mpi/usr/lib/$(DEB_SOURCE)/bin/HYPHYMPI-sse3
+	cp obj-avx/hyphy debian/hyphy-pt/usr/lib/$(DEB_SOURCE)/bin/hyphy-avx
+	cp obj-sse3/hyphy debian/hyphy-pt/usr/lib/$(DEB_SOURCE)/bin/hyphy-sse3
 	mv debian/hyphy-mpi/usr/bin/HYPHYMPI debian/hyphy-mpi/usr/lib/$(DEB_SOURCE)/bin/
 	mv debian/hyphy-pt/usr/bin/hyphy debian/hyphy-pt/usr/lib/$(DEB_SOURCE)/bin/
 	cd $(CURDIR)/debian/hyphy-mpi/usr/bin && \
@@ -59,8 +58,26 @@ ifeq (amd64,$(DEB_HOST_ARCH))
 		ln -s ../lib/$(DEB_SOURCE)/bin/simd-dispatch hyphy
 endif
 
+override_dh_install-indep:
+	dh_install -i
+ifeq (amd64,$(DEB_HOST_ARCH))
+	dh_install -phyphy-common debian/bin/simd-dispatch /usr/lib/$(DEB_SOURCE)/bin
+endif
+
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (amd64,$(DEB_HOST_ARCH))
+	set -e ; for SIMD in avx sse3 ; do \
+		if lscpu | grep -q $${SIMD} ; then \
+			find "obj-$${SIMD}/" \
+			-not -path "*/CMakeFiles/*" \
+			-type f,l \
+			-executable \
+			-exec cp -v '{}' . \; && \
+			./run_unit_tests.sh ; \
+		fi ; \
+	done
+endif
 	find "obj-$(DEB_HOST_GNU_TYPE)/" \
 		-not -path "*/CMakeFiles/*" \
 		-type f,l \



View it on GitLab: https://salsa.debian.org/med-team/hyphy/-/compare/0833938a0d724c8963adb0649722258eb6f731f0...8cb707d2dbbd6ec462403f48887c838cf4fca2c3

-- 
View it on GitLab: https://salsa.debian.org/med-team/hyphy/-/compare/0833938a0d724c8963adb0649722258eb6f731f0...8cb707d2dbbd6ec462403f48887c838cf4fca2c3
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/20210131/7d15b0ed/attachment-0001.html>