[med-svn] [Git][med-team/kmc][master] 6 commits: add support-mixed-march.patch
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Sun Aug 22 11:15:35 BST 2021
Étienne Mollier pushed to branch master at Debian Med / kmc
Commits:
e1f013c6 by Étienne Mollier at 2021-08-21T19:35:07+02:00
add support-mixed-march.patch
this allows one to rebuild the package with mixed architectures
configurations without hitting a failure to build from source.
Closes: #983930
- - - - -
82d79af0 by Étienne Mollier at 2021-08-21T19:40:47+02:00
update changelog
and remove now unnecessary "team upload" spotted by lintian.
- - - - -
80758524 by Étienne Mollier at 2021-08-21T19:41:35+02:00
routine-update: Standards-Version: 4.6.0
- - - - -
d23e0be4 by Étienne Mollier at 2021-08-21T20:14:02+02:00
d/usage_to_man: adjust directory creation
This fixes a spurious:
Can't exec "1": No such file or directory at /<<PKGBUILDDIR>>/debian/usage_to_man line 19.
at build time.
- - - - -
4e094ff8 by Étienne Mollier at 2021-08-22T12:08:34+02:00
update changelog
- - - - -
51faa852 by Étienne Mollier at 2021-08-22T12:14:34+02:00
routine-update: Ready to upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/support-mixed-march.patch
- debian/usage_to_man
Changes:
=====================================
debian/changelog
=====================================
@@ -1,14 +1,17 @@
-kmc (3.1.1+dfsg-4) UNRELEASED; urgency=medium
+kmc (3.1.1+dfsg-4) unstable; urgency=medium
[ Michael R. Crusoe ]
- * Team upload.
* debian/control: mark libkmc-dev as Multi-Arch: same
[ Étienne Mollier ]
* d/control: update my uploader address
* d/watch: fix broken link to github
+ * add support-mixed-march.patch (Closes: #983930)
+ * Standards-Version: 4.6.0 (routine-update)
+ * d/usage_to_man: adjust directory creation; fixes a spurious "Can't exec "1""
+ error message at build time
- -- Étienne Mollier <emollier at debian.org> Mon, 12 Jul 2021 22:45:55 +0200
+ -- Étienne Mollier <emollier at debian.org> Sun, 22 Aug 2021 12:09:16 +0200
kmc (3.1.1+dfsg-3) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13),
asciidoctor,
d-shlibs,
libsimde-dev
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/med-team/kmc
Vcs-Git: https://salsa.debian.org/med-team/kmc.git
Homepage: http://sun.aei.polsl.pl/kmc
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ newish_gcc_build_fix.patch
disable-python-bindings.patch
spelling.patch
simde
+support-mixed-march.patch
=====================================
debian/patches/support-mixed-march.patch
=====================================
@@ -0,0 +1,94 @@
+Description: support mixed machine capabilities without impeding the build
+ This allows one to build the package with almost any combination of machine
+ capabilities. The initial issue was reported against -march=x64-64-v2, but
+ the present patch extends to v3, and probably any combination thrown by a
+ -march=native. The issue seems tied to the way the build process is modified
+ by debian, so may not be very relevant cherry picked upstream.
+ .
+ Diagnostics information is kept around just in case, for convenience.
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983930
+Forwarded: not-needed
+Last-Update: 2021-08-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- kmc.orig/kmer_counter/raduls_avx.cpp
++++ kmc/kmer_counter/raduls_avx.cpp
+@@ -8,7 +8,11 @@
+ Date : 2019-05-19
+ */
+
++#ifdef __AVX2__
++#undef __AVX2__
++#endif
++
+ #include "stdafx.h"
+ #include "raduls_impl.h"
+
+-// ***** EOF
+\ No newline at end of file
++// ***** EOF
+--- kmc.orig/kmer_counter/raduls_sse2.cpp
++++ kmc/kmer_counter/raduls_sse2.cpp
+@@ -8,7 +8,17 @@
+ Date : 2019-05-19
+ */
+
++#ifdef __SSE4_1__
++#undef __SSE4_1__
++#endif
++#ifdef __AVX__
++#undef __AVX__
++#endif
++#ifdef __AVX2__
++#undef __AVX2__
++#endif
++
+ #include "stdafx.h"
+ #include "raduls_impl.h"
+
+-// ***** EOF
+\ No newline at end of file
++// ***** EOF
+--- kmc.orig/kmer_counter/raduls_sse41.cpp
++++ kmc/kmer_counter/raduls_sse41.cpp
+@@ -8,7 +8,14 @@
+ Date : 2019-05-19
+ */
+
++#ifdef __AVX__
++#undef __AVX__
++#endif
++#ifdef __AVX2__
++#undef __AVX2__
++#endif
++
+ #include "stdafx.h"
+ #include "raduls_impl.h"
+
+-// ***** EOF
+\ No newline at end of file
++// ***** EOF
+--- kmc.orig/kmer_counter/raduls_impl.h
++++ kmc/kmer_counter/raduls_impl.h
+@@ -725,12 +725,20 @@
+ }
+
+ #if defined(__AVX2__)
++#warning "building raduls radix sort for avx2"
+ #define RADULS_RADIX_SORT_FUNNAME RadixSortMSD_AVX2
+ #elif defined (__AVX__)
++#warning "building raduls radix sort for avx"
+ #define RADULS_RADIX_SORT_FUNNAME RadixSortMSD_AVX
+ #elif defined(__SSE4_1__)
++#warning "building raduls radix sort for sse4.1"
+ #define RADULS_RADIX_SORT_FUNNAME RadixSortMSD_SSE41
+ #else
++#if defined(__SSE2__)
++#warning "building raduls radix sort for sse2"
++#else
++#warning "building raduls radix sort for debian baseline with simde sse2 compat"
++#endif
+ #define RADULS_RADIX_SORT_FUNNAME RadixSortMSD_SSE2
+ #endif
+
=====================================
debian/usage_to_man
=====================================
@@ -2,6 +2,7 @@
use strict;
use warnings;
use Data::Dumper;
+use File::Path qw(make_path);
#Converts KMC usage into man pages. It's a bigger script than the man pages, but the plan is to have a future script that works for all packages
#The man pages are placed in the man folder in the main directory of the kmc package
@@ -16,7 +17,7 @@ sub createManPages {
unless ( -d $destination ) {
- system(mkdir $destination);
+ make_path( $destination );
}
my @files;
View it on GitLab: https://salsa.debian.org/med-team/kmc/-/compare/a41d1989aafe4a2f939d80d91913356ca54df23b...51faa852691347fb79dbb82d45668974de501f93
--
View it on GitLab: https://salsa.debian.org/med-team/kmc/-/compare/a41d1989aafe4a2f939d80d91913356ca54df23b...51faa852691347fb79dbb82d45668974de501f93
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/20210822/ad9fcc5a/attachment-0001.htm>
More information about the debian-med-commit
mailing list