[med-svn] [Git][med-team/diamond-aligner][master] 2 commits: use ld.gold

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / diamond-aligner


Commits:
d7da8052 by Michael R. Crusoe at 2020-01-13T20:46:35+01:00
use ld.gold

- - - - -
87a16edd by Michael R. Crusoe at 2020-01-13T20:46:54+01:00
0.9.29+dfsg-3

- - - - -


3 changed files:

- debian/changelog
- debian/patches/multi_arch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,10 @@
-diamond-aligner (0.9.29+dfsg-3) UNRELEASED; urgency=medium
+diamond-aligner (0.9.29+dfsg-3) unstable; urgency=medium
 
   * Team upload.
   * patch to enable non-x86 builds again (no -msse, etc..)
     Closes: #942850
 
- -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 13 Jan 2020 17:11:06 +0100
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 13 Jan 2020 19:34:04 +0100
 
 diamond-aligner (0.9.29+dfsg-2) unstable; urgency=medium
 


=====================================
debian/patches/multi_arch
=====================================
@@ -23,7 +23,7 @@ Subject: handle non-x86 builds again
  add_executable(diamond $<TARGET_OBJECTS:arch_generic>
    $<TARGET_OBJECTS:arch_sse4_1>
    src/run/main.cpp
-@@ -149,6 +153,91 @@
+@@ -149,6 +153,92 @@
    src/lib/tantan/LambdaCalculator.cc
    src/data/taxonomy_filter.cpp
  )
@@ -111,6 +111,7 @@ Subject: handle non-x86 builds again
 +  src/util/math/sparse_matrix.cpp
 +  src/lib/tantan/LambdaCalculator.cc
 +  src/data/taxonomy_filter.cpp
++)
 +endif()
  
  if(EXTRA)


=====================================
debian/rules
=====================================
@@ -8,7 +8,11 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 include /usr/share/dpkg/default.mk
 
-ifneq (,$(filter(DEB_HOST_ARCH),i386 amd64))
+export LD=ld.gold
+export DEB_CFLAGS_MAINT_APPEND+=-fuse-ld=gold
+export DEB_CXXFLAGS_MAINT_APPEND+=-fuse-ld=gold
+
+ifeq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
 	EXTRA=-DX86=OFF
 endif
 



View it on GitLab: https://salsa.debian.org/med-team/diamond-aligner/compare/e60db68ca1e63fe7938ace1d5776d9e2cb751592...87a16edd4b62c2a2a56bde039b5e6b00825f065b

-- 
View it on GitLab: https://salsa.debian.org/med-team/diamond-aligner/compare/e60db68ca1e63fe7938ace1d5776d9e2cb751592...87a16edd4b62c2a2a56bde039b5e6b00825f065b
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/20200113/a89e67b9/attachment-0001.html>