Andreas Tille pushed to branch master at Debian Med / libssw
Commits: 64733be2 by Andreas Tille at 2020-08-13T12:55:30+02:00 Make sure library will be build before it is used for linking - - - - - 28c54602 by Andreas Tille at 2020-08-13T12:59:20+02:00 Revert non-parallel build - - - - - fff4c9ce by Andreas Tille at 2020-08-13T13:41:49+02:00 Team upload - - - - - a689b8e6 by Andreas Tille at 2020-08-13T13:42:01+02:00 routine-update: debhelper-compat 13 - - - - - 35b74462 by Andreas Tille at 2020-08-13T13:44:30+02:00 routine-update: Ready to upload to unstable - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/build_all_libs.patch - debian/patches/rename_tool.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,10 @@ -libssw (1.1-11) UNRELEASED; urgency=medium +libssw (1.1-11) unstable; urgency=medium - * No parallel build (otherwise some architectures fail to create - static lib right in time) + * Team upload + * Make sure library will be build before it is used for linking + * debhelper-compat 13 (routine-update) - -- Andreas Tille <[email protected]> Wed, 12 Aug 2020 13:44:12 +0200 + -- Andreas Tille <[email protected]> Thu, 13 Aug 2020 13:42:07 +0200 libssw (1.1-10) unstable; urgency=medium ===================================== debian/control ===================================== @@ -5,7 +5,7 @@ Uploaders: Sascha Steinbiss <[email protected]>, Section: science Priority: optional Build-Depends: debhelper (>= 12~), - debhelper-compat (= 12), + debhelper-compat (= 13), default-jdk-headless <!nojava>, javahelper <!nojava>, help2man, ===================================== debian/patches/build_all_libs.patch ===================================== @@ -6,7 +6,7 @@ Description: build all libraries Author: Sascha Steinbiss <[email protected]> --- a/src/Makefile +++ b/src/Makefile -@@ -5,24 +5,29 @@ CXXFLAGS := $(CFLAGS) +@@ -5,26 +5,31 @@ CXXFLAGS := $(CFLAGS) LOBJS = ssw.o LCPPOBJS = ssw_cpp.o PROG = ssw_test @@ -36,11 +36,14 @@ Author: Sascha Steinbiss <[email protected]> - $(CC) $(CFLAGS) -fPIC -shared -rdynamic -o $@ $< +$(LIB): ssw.c ssw.h ssw_cpp.h ssw_cpp.cpp + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -shared -rdynamic -Wl,-soname,$(LIB) -o $@ $^ -+ + +-$(PROG): main.c kseq.h +$(STATICLIB): $(LOBJS) $(LCPPOBJS) + ar rcs $@ $^ ++ ++$(PROG): main.c kseq.h $(LIB) $(STATICLIB) - $(PROG): main.c kseq.h + $(EXAMPLE): example.c @@ -38,10 +43,10 @@ $(JAVA_LIB): sswjni.c ssw.c ssw.h $(CC) $(CFLAGS) $(JAVA_INLCUDES) -fPIC -shared -rdynamic -o $@ $< ssw.c ===================================== debian/patches/rename_tool.patch ===================================== @@ -13,12 +13,10 @@ Author: Sascha Steinbiss <[email protected]> SOVERS=.0 LIB = libssw.so$(SOVERS) STATICLIB = libssw.a -@@ -30,11 +30,12 @@ $(LIB): ssw.c ssw.h ssw_cpp.h ssw_cpp.cp - $(STATICLIB): $(LOBJS) $(LCPPOBJS) +@@ -31,10 +31,11 @@ $(STATICLIB): $(LOBJS) $(LCPPOBJS) ar rcs $@ $^ --$(PROG): main.c kseq.h -+$(PROG): main.c kseq.h $(LIB) + $(PROG): main.c kseq.h $(LIB) $(STATICLIB) + $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ main.c kseq.h -L. -lssw -lm -lz $(LDFLAGS) $(EXAMPLE): example.c ===================================== debian/rules ===================================== @@ -26,9 +26,9 @@ override_dh_auto_clean: override_dh_auto_build: ifneq ($(filter nojava,$(DEB_BUILD_PROFILES)),) - dh_auto_build --no-parallel --sourcedirectory src -- default + dh_auto_build --sourcedirectory src -- default else - dh_auto_build --no-parallel --sourcedirectory src -- default java + dh_auto_build --sourcedirectory src -- default java endif ifneq ($(filter nojava,$(DEB_BUILD_PROFILES)),) View it on GitLab: https://salsa.debian.org/med-team/libssw/-/compare/82783228dd06349293b9f6fd996a26f0a11775a9...35b744625c8cda6569b8836d3247cdae3dfdd258 -- View it on GitLab: https://salsa.debian.org/med-team/libssw/-/compare/82783228dd06349293b9f6fd996a26f0a11775a9...35b744625c8cda6569b8836d3247cdae3dfdd258 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
