Mohd Bilal pushed to branch master at Debian Med / libtabixpp
Commits: 62ca9553 by Mohammed Bilal at 2022-07-14T20:18:33+05:30 Refresh patch - - - - - a2efe68c by Mohammed Bilal at 2022-07-14T14:57:30+00:00 Refresh patch - - - - - f08397c8 by Mohammed Bilal at 2022-07-14T20:36:16+05:30 Update changelog - - - - - 2 changed files: - debian/changelog - debian/patches/build_shared_lib_with_debian_htslib.patch Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,13 @@ libtabixpp (1.1.1-1) UNRELEASED; urgency=medium + [ Andreas Tille ] * New upstream version * Proper filename for upstream tarball - -- Andreas Tille <[email protected]> Fri, 29 Apr 2022 12:04:20 +0200 + [ Mohammed Bilal ] + * Refresh patch + + -- Mohammed Bilal <[email protected]> Thu, 14 Jul 2022 20:35:35 +0530 libtabixpp (1.1.0-6) unstable; urgency=medium ===================================== debian/patches/build_shared_lib_with_debian_htslib.patch ===================================== @@ -4,28 +4,26 @@ Description: Build shared lib with Debian's htslib Debian's shared libhts from the archive. Also builds a shared library instead of a static one. Author: Sascha Steinbiss <[email protected]> ---- libtabixpp.orig/Makefile -+++ libtabixpp/Makefile -@@ -3,7 +3,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,6 @@ - CC?= gcc - CXX?= g++ --CXXFLAGS?= -g -Wall -O2 -fPIC #-m64 #-arch ppc -+CXXFLAGS+= -fPIC - INCLUDES?= -Ihtslib - HTS_HEADERS?= htslib/htslib/bgzf.h htslib/htslib/tbx.h - HTS_LIB?= htslib/libhts.a -@@ -12,6 +12,7 @@ - DFLAGS= -D_FILE_OFFSET_BITS=64 -D_USE_KNETFILE - PROG= tabix++ - SUBDIRS=. + CC ?= cc + CXX ?= c++ +-CXXFLAGS ?= -g -Wall -O2 #-m64 #-arch ppc + CXXFLAGS += -fPIC + INCLUDES ?= -Ihtslib + HTS_HEADERS ?= htslib/htslib/bgzf.h htslib/htslib/tbx.h +@@ -30,30 +29,23 @@ + SLIB = libtabix.so.$(SOVERSION) + OBJS = tabix.o + SUBDIRS = . +- +SONUMBER=0 + .SUFFIXES:.c .o - ifeq ($(OS),Windows_NT) - LIBS += -lws2_32 -@@ -22,31 +23,22 @@ .c.o: - $(CC) $(CPPFLAGS) -c $(CXXFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@ + $(CC) -c $(CXXFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@ -all-recur lib-recur clean-recur cleanlocal-recur install-recur: - @target=`echo $@ | sed s/-recur//`; \ @@ -37,13 +35,13 @@ Author: Sascha Steinbiss <[email protected]> - || exit 1; \ - cd $$wdir; \ - done; -+all: $(PROG) libtabixpp.so.$(SONUMBER) libtabixpp.a - --all: $(PROG) - +-all: $(BIN) $(LIB) $(SLIB) ++all: $(BIN) libtabixpp.so.$(SONUMBER) libtabixpp.a + -tabix.o: $(HTS_HEADERS) tabix.cpp tabix.hpp +tabix.o: tabix.cpp tabix.hpp - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c tabix.cpp $(INCLUDES) + $(CXX) $(CXXFLAGS) -c tabix.cpp $(INCLUDES) -htslib/libhts.a: - cd htslib && $(MAKE) lib-static @@ -52,16 +50,26 @@ Author: Sascha Steinbiss <[email protected]> + +libtabixpp.so.$(SONUMBER): tabix.o + $(CXX) -shared -o $@ $< -fPIC -Wl,-soname,libtabixpp.so.$(SONUMBER) $(LDFLAGS) -lhts ++ + + $(LIB): $(OBJS) + $(AR) rs $(LIB) $(OBJS) +@@ -61,7 +53,7 @@ + $(SLIB): $(OBJS) + $(CXX) -shared -Wl,-soname,$(SLIB) -o $(SLIB) $(OBJS) --tabix++: tabix.o main.cpp $(HTS_LIB) -+tabix++: tabix.o main.cpp - $(CXX) $(LDFLAGS) $(CPPFLAGS) $(CXXFLAGS) -o $@ main.cpp tabix.o $(INCLUDES) $(LIBPATH) $(LIBS) +-tabix++: $(OBJS) main.cpp $(HTS_LIB) ++tabix++: $(OBJS) main.cpp + $(CXX) $(CXXFLAGS) -o $@ main.cpp $(OBJS) $(INCLUDES) $(LIBPATH) \ + -lhts -lpthread -lm -lz -lcurl -llzma -lbz2 +@@ -82,7 +74,6 @@ cleanlocal: - rm -fr gmon.out *.o a.out *.dSYM $(PROG) *~ *.a tabix.aux tabix.log \ -- tabix.pdf *.class libtabix.*.dylib libtabix.so* + rm -rf $(BIN) $(LIB) $(SLIB) $(OBJS) $(DESTDIR) + rm -fr gmon.out *.o a.out *.dSYM $(BIN) *~ *.a tabix.aux tabix.log \ +- tabix.pdf *.class libtabix.*.dylib - cd htslib && $(MAKE) clean + tabix.pdf *.class libtabix*.dylib libtabix*so* --clean:cleanlocal-recur -+clean: cleanlocal +-clean: cleanlocal-recur ++clean: cleanlocal View it on GitLab: https://salsa.debian.org/med-team/libtabixpp/-/compare/6b19de25df96620f12092651016ab7aba73d55c3...f08397c8ca20793cf70603c1941a4a7065d0a2fe -- View it on GitLab: https://salsa.debian.org/med-team/libtabixpp/-/compare/6b19de25df96620f12092651016ab7aba73d55c3...f08397c8ca20793cf70603c1941a4a7065d0a2fe 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
