[med-svn] [Git][med-team/libmaus2][master] 3 commits: remove fix-build-on-non-x86.patch

[Étienne Mollier (@emollier)]

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


Commits:
820aca4f by Étienne Mollier at 2021-08-26T01:35:43+02:00
remove fix-build-on-non-x86.patch

The problem has been solved upstream.

- - - - -
34947d13 by Étienne Mollier at 2021-08-26T01:42:41+02:00
add fix-build-on-non-x86.patch

Fixes build failure on arm64 and ppc64el, among other things.

- - - - -
a6b5aae3 by Étienne Mollier at 2021-08-26T01:44:27+02:00
dep3 header (stub)

Gbp-Dch: ignore

- - - - -


3 changed files:

- + debian/patches/fix-build-on-non-x86.patch
- − debian/patches/fix-test-on-32bits.patch
- debian/patches/series


Changes:

=====================================
debian/patches/fix-build-on-non-x86.patch
=====================================
@@ -0,0 +1,24 @@
+Description: fix build failures on non-x86 platforms
+Author: Étienne Mollier <emollier at debian.org>
+Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Last-Update: 2021-08-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- libmaus2.orig/src/libmaus2/lcs/AlignmentOneAgainstManyAVX2.cpp
++++ libmaus2/src/libmaus2/lcs/AlignmentOneAgainstManyAVX2.cpp
+@@ -312,7 +312,6 @@
+ 		}
+ 	}
+ };
+-#endif
+ 
+ libmaus2::lcs::AlignmentOneAgainstManyAVX2::AlignmentOneAgainstManyAVX2()
+ : context(new AlignmentOneAgainstManyAVX2Context,[](auto p){delete reinterpret_cast<AlignmentOneAgainstManyAVX2Context *>(p);})
+@@ -324,6 +323,7 @@
+ 	throw lme;
+ 	#endif
+ }
++#endif
+ 
+ void libmaus2::lcs::AlignmentOneAgainstManyAVX2::process(
+ 	uint8_t const * qa,


=====================================
debian/patches/fix-test-on-32bits.patch deleted
=====================================
@@ -1,22 +0,0 @@
-Description: fix test breaking due to type mismatch on 32 bits platforms
- Note: the upstream author adopted a different approach, so don't forget to
- remove this patch on next version.
-Author: Étienne Mollier <emollier at debian.org>
-Forwarded: https://gitlab.com/german.tischler/libmaus2/-/issues/35
-Last-Update: 2021-06-27
-Applied-Upstream: 2.0.792
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- libmaus2.orig/src/test/testnplself.cpp
-+++ libmaus2/src/test/testnplself.cpp
-@@ -66,8 +66,8 @@
- 
- 			libmaus2::lcs::NPLSelf np;
- 
--			std::size_t const ab = 0;
--			std::size_t const bb = 1;
-+			std::uint64_t const ab = 0;
-+			std::uint64_t const bb = 1;
- 
- 			np.np(
- 				a.begin()+ab,a.end(),


=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-fix-test-on-32bits.patch
+fix-build-on-non-x86.patch



View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/28f78193f25647f705d98be8085a7afc1d0e492b...a6b5aae3d73f420c0a45c15fe7e4fdbc480da842

-- 
View it on GitLab: https://salsa.debian.org/med-team/libmaus2/-/compare/28f78193f25647f705d98be8085a7afc1d0e492b...a6b5aae3d73f420c0a45c15fe7e4fdbc480da842
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/20210826/0f596b63/attachment-0001.htm>