[med-svn] [Git][med-team/pufferfish][master] 3 commits: nocheck is respected automatically with debhelper-compat 13.

[Andrius Merkys (@merkys)]

Andrius Merkys pushed to branch master at Debian Med / pufferfish


Commits:
5ed70bfc by Andrius Merkys at 2022-10-03T02:01:45-04:00
nocheck is respected automatically with debhelper-compat 13.

- - - - -
f4dadea9 by Andrius Merkys at 2022-10-03T02:04:23-04:00
Add DEB_HOST_MULTIARCH to LDFLAGS.

- - - - -
ca41fdaa by Andrius Merkys at 2022-10-04T01:40:19-04:00
No need to link with graphdump as it is included in twopaco.

- - - - -


2 changed files:

- debian/patches/use-debian-libs
- debian/rules


Changes:

=====================================
debian/patches/use-debian-libs
=====================================
@@ -63,7 +63,15 @@
  
  if(TBB_RECONFIGURE OR TBB_TARGET_EXISTED)
    target_link_libraries(pufferfish 
-@@ -169,7 +169,7 @@
+@@ -133,7 +133,6 @@
+     puffer 
+     z 
+     twopaco 
+-    graphdump 
+     ntcard 
+     ${LIBRT} 
+     ${ASAN_LIB} 
+@@ -169,7 +168,7 @@
      )
  target_compile_options(filtersam PUBLIC "$<$<CONFIG:DEBUG>:${PUFF_DEBUG_FLAGS}>")
  target_compile_options(filtersam PUBLIC "$<$<CONFIG:RELEASE>:${PUFF_RELEASE_FLAGS}>")
@@ -72,7 +80,7 @@
  #add_dependencies(filtersam puffer)
  
  
-@@ -186,8 +186,6 @@
+@@ -186,8 +185,6 @@
  target_compile_options(cedar PUBLIC "$<$<CONFIG:DEBUG>:${PUFF_DEBUG_FLAGS}>")
  target_compile_options(cedar PUBLIC "$<$<CONFIG:RELEASE>:${PUFF_RELEASE_FLAGS}>")
  target_link_libraries(cedar Async++ Threads::Threads seqlib hts puffer bz2 lzma z SetCover ${ASAN_LIB})
@@ -81,7 +89,7 @@
  #add_dependencies(ceder Async++)
  #add_dependencies(ceder seqlib)
  
-@@ -219,7 +217,7 @@
+@@ -219,7 +216,7 @@
  #target_link_libraries(edgedensity Threads::Threads z puffer ${ASAN_LIB})
  #target_link_libraries(edgedensity2 Threads::Threads z puffer ${ASAN_LIB})
  target_link_libraries(filtersam Threads::Threads seqlib hts puffer bz2 lzma z ${ASAN_LIB})


=====================================
debian/rules
=====================================
@@ -5,10 +5,10 @@ export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/default.mk
 
-# for hardening you might like to uncomment this:
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 export DEB_CXXFLAGS_MAINT_APPEND = -I/usr/include/jsoncpp
+export DEB_LDFLAGS_MAINT_APPEND = -L/usr/lib/$(DEB_HOST_MULTIARCH)
 
 %:
 	dh $@
@@ -21,9 +21,3 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install
 	chrpath --delete $(CURDIR)/debian/pufferfish/usr/bin/*
-
-### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
-#override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-#	do_stuff_for_testing
-#endif



View it on GitLab: https://salsa.debian.org/med-team/pufferfish/-/compare/c5eae7dd86a307812802f98f37893cae0ca134f8...ca41fdaae4e6aa5c921b7220087f533e68ff5516

-- 
View it on GitLab: https://salsa.debian.org/med-team/pufferfish/-/compare/c5eae7dd86a307812802f98f37893cae0ca134f8...ca41fdaae4e6aa5c921b7220087f533e68ff5516
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/20221115/62843b99/attachment-0001.htm>