[med-svn] [Git][med-team/libslow5lib][master] 3 commits: Support zstd compression

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / libslow5lib


Commits:
8c492586 by Andreas Tille at 2022-06-30T10:31:00+02:00
Support zstd compression

- - - - -
c21308d2 by Andreas Tille at 2022-06-30T10:49:05+02:00
Trigger build time test

- - - - -
0ff7a9dc by Andreas Tille at 2022-06-30T10:51:57+02:00
Use Debian packaged streamvbyte in test ... but unfortunately this fails.

- - - - -


2 changed files:

- debian/patches/use_debian_packaged_streamvbyte.patch
- debian/rules


Changes:

=====================================
debian/patches/use_debian_packaged_streamvbyte.patch
=====================================
@@ -29,3 +29,14 @@ Description: Use Debian packaged streamvbyte library
  
  # Build a static lib
  #add_library(slow5 STATIC ${slow5_} ${slow5_idx} ${slow5_misc} ${slow5_press})
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -4,7 +4,7 @@ LIB			= ../lib
+ CPPFLAGS	+= -I ../include/ -I $(SRC)/
+ #CFLAGS		+= -g -Wall -Werror -Wpedantic -std=c99
+ CFLAGS		+= -g -Wall -Werror -std=gnu99
+-LDFLAGS		+= $(LIB)/libslow5.a -lm -lz
++LDFLAGS		+= $(LIB)/libslow5.a -lm -lz -lstreamvbyte
+ ifeq ($(zstd),1)
+ CFLAGS		+= -DSLOW5_USE_ZSTD
+ LDFLAGS		+= -lzstd


=====================================
debian/rules
=====================================
@@ -4,27 +4,22 @@
 export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/default.mk
-# this provides:
-# DEB_SOURCE: the source package name
-# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
-# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
-# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
-# DEB_VERSION_UPSTREAM: the package's upstream version
-# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
-# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as
-#                    specified by <https://reproducible-builds.org/specs/source-date-epoch/>
 
 # for hardening you might like to uncomment this:
-# export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@ --with python3 --buildsystem=cmake
 
-### 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
+override_dh_auto_configure:
+	dh_auto_configure -- \
+                -DSLOW5_USE_ZSTD="ON" \
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	cp -a obj-$(DEB_HOST_GNU_TYPE)/libslow5_static.a lib/libslow5.a
+	$(MAKE) -C test zstd=1
+endif
 
 override_dh_install:
 	mv debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)/libslow5_static.a debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)/libslow5.a



View it on GitLab: https://salsa.debian.org/med-team/libslow5lib/-/compare/1365bd3ba5f28c73f869de98d9096cc3bb9e8fba...0ff7a9dc9fc8a244f5761e801fe580ae0f24cd13

-- 
View it on GitLab: https://salsa.debian.org/med-team/libslow5lib/-/compare/1365bd3ba5f28c73f869de98d9096cc3bb9e8fba...0ff7a9dc9fc8a244f5761e801fe580ae0f24cd13
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/20220630/aea71e40/attachment-0001.htm>