[med-svn] [Git][med-team/plink2][master] 3 commits: d/rules: build avx2 variant with -mfma, fixing build failure.

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / plink2


Commits:
81114c40 by Étienne Mollier at 2022-08-05T20:34:27+02:00
d/rules: build avx2 variant with -mfma, fixing build failure.

- - - - -
4aea933c by Étienne Mollier at 2022-08-05T22:14:08+02:00
d/b/simd-dispatch: fix launcher for avx2 variant and filter fma.

- - - - -
3966fd85 by Étienne Mollier at 2022-08-05T22:39:43+02:00
ready to upload to unstable.

- - - - -


3 changed files:

- debian/bin/simd-dispatch
- debian/changelog
- debian/rules


Changes:

=====================================
debian/bin/simd-dispatch
=====================================
@@ -15,15 +15,21 @@ function test_and_run () {
 }
 
 function test_and_run_avx2 () {
-	if grep -q avx2 /proc/cpuinfo | grep bmi | grep bmi2 | grep abm && [ -x "${BASE}-avx2" ]; then
+	if cat /proc/cpuinfo \
+	   | grep avx2 \
+	   | grep bmi \
+	   | grep bmi2 \
+	   | grep abm \
+	   | grep fma \
+	   > /dev/null \
+	   && [ -x "${BASE}-avx2" ]; then
 		cmd="${BASE}-avx2"
-		shift
 		"${cmd}" "$@"
 		exit
 	fi
 }
 
-test_and_run_avx2 "@"
+test_and_run_avx2 "$@"
 
 for SIMD in avx sse4.1 ssse3 sse3 sse2 sse mmx ; do test_and_run ${SIMD} "$@" ; done
 


=====================================
debian/changelog
=====================================
@@ -1,9 +1,16 @@
-plink2 (2.00~a3.3-220801+dfsg-1) UNRELEASED; urgency=medium
+plink2 (2.00~a3.3-220801+dfsg-1) unstable; urgency=medium
 
   * Team upload.
-  * New upstream version
 
- -- Andreas Tille <tille at debian.org>  Thu, 04 Aug 2022 21:56:39 +0200
+  [ Andreas Tille ]
+  * New upstream version 2.00~a3.3-220801+dfsg
+  * Refresh patches
+
+  [ Étienne Mollier ]
+  * d/rules: build avx2 variant with -mfma, fixing build failure.
+  * d/bin/simd-dispatch: fix launcher for avx2 variant and filter fma.
+
+ -- Étienne Mollier <emollier at debian.org>  Fri, 05 Aug 2022 22:15:46 +0200
 
 plink2 (2.00~a3.3-220603+dfsg-1) unstable; urgency=medium
 


=====================================
debian/rules
=====================================
@@ -41,9 +41,10 @@ override_dh_auto_build-arch:
 ifeq (amd64,$(DEB_HOST_ARCH))
 	mkdir -p $(prefix)
 	mkdir -p $(libexecdir)
-	export CXXFLAGS="$(CXXFLAGS) -mavx2 -mbmi -mbmi2 -mlzcnt" && export CFLAGS="$(CFLAGS) -mavx2 -mbmi -mbmi2 -mlzcnt" && \
-		make clean ; \
-		dh_auto_build -- SFX=-avx2
+	export CXXFLAGS="$(CXXFLAGS) -mavx2 -mbmi -mbmi2 -mlzcnt -mfma" \
+	&& export CFLAGS="$(CFLAGS) -mavx2 -mbmi -mbmi2 -mlzcnt -mfma" \
+	&& make clean \
+	; dh_auto_build -- SFX=-avx2
 	for SIMD in avx sse4.1 ssse3 sse3 sse2 ; do \
 		export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && \
 		make clean ; \



View it on GitLab: https://salsa.debian.org/med-team/plink2/-/compare/ac0e53db8f070b4d55653fad23607c5d4531d0fe...3966fd8542ef1088dd35eed6bac3fac3943fb94c

-- 
View it on GitLab: https://salsa.debian.org/med-team/plink2/-/compare/ac0e53db8f070b4d55653fad23607c5d4531d0fe...3966fd8542ef1088dd35eed6bac3fac3943fb94c
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/20220805/15fc7936/attachment-0001.htm>