[med-svn] [Git][med-team/mmseqs2][master] Apply patch from Adrian Bunk to revert optimisation for i386

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / mmseqs2


Commits:
8d13131c by Andreas Tille at 2020-05-20T08:35:16+02:00
Apply patch from Adrian Bunk to revert optimisation for i386

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mmseqs2 (11-e1a1c+ds-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Apply patch from Adrian Bunk to revert optimisation for i386
+    Closes: #961101
+
+ -- Andreas Tille <tille at debian.org>  Wed, 20 May 2020 08:34:37 +0200
+
 mmseqs2 (11-e1a1c+ds-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -23,13 +23,6 @@ ifeq (amd64,$(DEB_HOST_ARCH))
 	        export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && \
 	        dh_auto_configure --builddirectory build_$${SIMD} -- -DEXE_SUFFIX=-$${SIMD} -DVERSION_OVERRIDE=$(DEB_VERSION) ; \
 	done
-else ifeq (i386,$(DEB_HOST_ARCH))
-	for SIMD in ssse3 sse3 sse2 ; do \
-	        export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && \
-	        dh_auto_configure --builddirectory build_$${SIMD} -- -DEXE_SUFFIX=-$${SIMD} -DVERSION_OVERRIDE=$(DEB_VERSION) ; \
-	done
-	export CXXFLAGS="$(CXXFLAGS)" && export CFLAGS="$(CFLAGS)" && \
-		dh_auto_configure --builddirectory build_plain -- -DEXE_SUFFIX=-plain -DVERSION_OVERRIDE=$(DEB_VERSION)
 else
 	dh_auto_configure -- -DVERSION_OVERRIDE=$(DEB_VERSION)
 endif
@@ -42,12 +35,6 @@ ifeq (amd64,$(DEB_HOST_ARCH))
 	for SIMD in avx2 avx sse4.1 ssse3 sse3 sse2 ; do \
 		dh_auto_build --builddirectory build_$${SIMD} ; \
 	done
-else ifeq (i386,$(DEB_HOST_ARCH))
-	mkdir -p $(binprefix)
-	for SIMD in ssse3 sse3 sse2 ; do \
-	        dh_auto_build --builddirectory build_$${SIMD} ; \
-	done
-	dh_auto_build --builddirectory build_plain
 else
 	dh_auto_build
 endif
@@ -64,16 +51,6 @@ ifeq (amd64,$(DEB_HOST_ARCH))
 	cd $(binprefix) \
 		&& for prog in mmseqs ; do \
 		ln -s ../lib/$(DEB_SOURCE)/simd-dispatch $${prog} ; done
-else ifeq (i386,$(DEB_HOST_ARCH))
-	dh_install -pmmseqs2 debian/bin/simd-dispatch /usr/lib/$(DEB_SOURCE)/
-	for SIMD in ssse3 sse3 sse2 ; do \
-	        dh_auto_install --builddirectory build_$${SIMD} ; \
-	done
-	dh_auto_install --builddirectory build_plain
-	dh_install -pmmseqs2 usr/bin/mmseqs-* usr/bin/
-	cd $(binprefix) \
-		&& for prog in mmseqs ; do \
-		ln -s ../lib/$(DEB_SOURCE)/simd-dispatch $${prog} ; done
 else
 	dh_auto_install
 	dh_install -pmmseqs2 usr/bin/mmseqs usr/bin/



View it on GitLab: https://salsa.debian.org/med-team/mmseqs2/-/commit/8d13131cf09bd65340ffc419179cac4efcc1c6b7

-- 
View it on GitLab: https://salsa.debian.org/med-team/mmseqs2/-/commit/8d13131cf09bd65340ffc419179cac4efcc1c6b7
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/20200520/227d8f5d/attachment-0001.html>