...
 
Commits (7)
libmstoolkit (82-6) unstable; urgency=medium
* Fixing the linker command line such that the libs appear at the end of
the link command. Thanks to Gianfranco Costamagna
<locutusofborg@debian.org> for the patch.
-- Filippo Rusconi <lopippo@debian.org> Mon, 05 Mar 2018 15:52:53 +0100
libmstoolkit (82-5) UNRELEASED; urgency=medium
* Fixing the dependencies.
-- Filippo Rusconi <lopippo@debian.org> Thu, 01 Mar 2018 17:34:08 +0100
libmstoolkit (82-4) unstable; urgency=medium
* Fix the problem with linking MSSingleScan binary. And add it to the
......
......@@ -46,7 +46,6 @@ Description: libraries for manipulating mass spectrometry data - dev files
Package: libmstoolkit82
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Conflicts: libmstoolkit77
......@@ -75,12 +74,14 @@ Description: libraries for manipulating mass spectrometry data - runtime
- libmstoolkit;
- libmstoolkitlite;
Package: libmstoolkit-tools
Section: science
Architecture: any
Depends: ${shlibs:Depends},
Depends: libmstoolkit82 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Description: libraries for manipulating mass spectrometry data - runtime
Description: libraries for manipulating mass spectrometry data - tools
The MSToolkit is a light-weight C++ library for reading, writing, and
manipulating mass spectrometry data. The MSToolkit is easily linked
to virtually any C++ algorithm for simple, fast file reading and
......
Patch to build static and shared object version of the library the Debian way.
diff --git a/Makefile b/Makefile
index 8f8f087..76aa285 100644
--- a/Makefile
......@@ -90,16 +92,16 @@ index 8f8f087..76aa285 100644
+solib: CFLAGS = $(SO_CFLAGS)
+solib: clean_objects objects
+
+ $(CC) $(CFLAGS) -o libmstoolkitlite.so.$(RELVER) -Wl,-z,relro -Wl,-soname,libmstoolkitlite.so.$(SOVER) $(LIBS) $(MZPARSERLITE) $(MSTOOLKIT) $(READERLITE)
+ $(CC) $(CFLAGS) -o libmstoolkitlite.so.$(RELVER) -Wl,-z,relro -Wl,-soname,libmstoolkitlite.so.$(SOVER) $(MZPARSERLITE) $(MSTOOLKIT) $(READERLITE) $(LIBS)
+ ln -sf libmstoolkitlite.so.$(RELVER) libmstoolkitlite.so.$(SOVER)
+ ln -sf libmstoolkitlite.so.$(SOVER) libmstoolkitlite.so
+
+ $(CC) $(CFLAGS) -o libmstoolkit.so.$(RELVER) -Wl,-z,relro -Wl,-soname,libmstoolkit.so.$(SOVER) $(LIBS) $(MZPARSER) $(MSTOOLKIT) $(READER)
+ $(CC) $(CFLAGS) -o libmstoolkit.so.$(RELVER) -Wl,-z,relro -Wl,-soname,libmstoolkit.so.$(SOVER) $(MZPARSER) $(MSTOOLKIT) $(READER) $(LIBS)
+ ln -sf libmstoolkit.so.$(RELVER) libmstoolkit.so.$(SOVER)
+ ln -sf libmstoolkit.so.$(SOVER) libmstoolkit.so
+
+ # Be careful not to include in the linker command line below the compilation -shared -fPIC flags!
+ $(CC) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DGCC -DHAVE_EXPAT_CONFIG_H -I./include $(LIBS) -L. -lmstoolkitlite MSSingleScan/MSSingleScan.cpp -o msSingleScan
+ $(CC) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DGCC -DHAVE_EXPAT_CONFIG_H -I./include -L. MSSingleScan/MSSingleScan.cpp -o msSingleScan $(LIBS) -lmstoolkitlite
-trees.o : $(ZLIB_PATH)/trees.c
- $(GCC) $(CFLAGS) $(ZLIB_PATH)/trees.c -c
......