[med-svn] [Git][med-team/libedlib][master] 5 commits: Refresh patch
Nilesh Patra
gitlab at salsa.debian.org
Fri Jan 8 13:43:50 GMT 2021
Nilesh Patra pushed to branch master at Debian Med / libedlib
Commits:
ac974c2f by Nilesh Patra at 2021-01-08T19:08:24+05:30
Refresh patch
- - - - -
fee49683 by Nilesh Patra at 2021-01-08T19:08:31+05:30
Enable building both shared and static lib
- - - - -
603e7e8e by Nilesh Patra at 2021-01-08T19:08:51+05:30
Rename lib package as per package version
- - - - -
3ec8ed93 by Nilesh Patra at 2021-01-08T19:08:58+05:30
Modify d-shlibs for pkgconfig and gnuinstalldirs
- - - - -
b0c302fa by Nilesh Patra at 2021-01-08T19:09:07+05:30
Update changelog
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/patches/do_not_build_hello_example.patch
- + debian/patches/enable_shared_and_static.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,10 +1,20 @@
libedlib (1.2.6-1) UNRELEASED; urgency=medium
+ * Team Upload.
+ [ Andreas Tille ]
* New upstream version
* Standards-Version: 4.5.0 (routine-update)
- TODO: Upstream has adapted some of our patches - but we need to get back static lib
- -- Andreas Tille <tille at debian.org> Tue, 11 Feb 2020 08:28:56 +0100
+ [ Steffen Moeller ]
+ * Added refs to conda and omictools
+
+ [ Nilesh Patra ]
+ * Refresh patch
+ * Enable building both shared and static lib
+ * Modify d-shlibs for pkgconfig and gnuinstalldirs
+ * Rename lib package as per package version
+
+ -- Nilesh Patra <npatra974 at gmail.com> Fri, 08 Jan 2021 13:28:10 +0000
libedlib (1.2.4-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Vcs-Browser: https://salsa.debian.org/med-team/libedlib
Vcs-Git: https://salsa.debian.org/med-team/libedlib.git
Homepage: https://github.com/Martinsos/edlib
-Package: libedlib0
+Package: libedlib1.2.5
Architecture: any
Section: libs
Depends: ${misc:Depends},
@@ -53,7 +53,7 @@ Architecture: any
Section: libdevel
Depends: ${misc:Depends},
${shlibs:Depends},
- libedlib0 (= ${binary:Version})
+ libedlib1.2.5 (= ${binary:Version})
Description: library for sequence alignment using edit distance (devel)
A lightweight and super fast C/C++ library for sequence alignment using
edit distance.
@@ -85,7 +85,7 @@ Package: edlib-aligner
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- libedlib0 (= ${binary:Version})
+ libedlib1.2.5 (= ${binary:Version})
Description: edlib sequence alignment tool using edit distance
Edlib is a lightweight and super fast C/C++ library for sequence
alignment using edit distance. This package provides an aligner
=====================================
debian/patches/do_not_build_hello_example.patch
=====================================
@@ -4,14 +4,14 @@ Description: helloWorld example does not properly build ... but why should we?
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -50,8 +50,8 @@ target_include_directories(edlib_static
+@@ -58,8 +58,8 @@
$<INSTALL_INTERFACE:include>)
# Build binaries.
-add_executable(helloWorld apps/hello-world/helloWorld.c)
--target_link_libraries(helloWorld edlib_static)
+-target_link_libraries(helloWorld edlib)
+#add_executable(helloWorld apps/hello-world/helloWorld.c)
-+#target_link_libraries(helloWorld edlib_static)
++#target_link_libraries(helloWorld edlib)
- add_executable(runTests test/runTests.cpp)
- target_link_libraries(runTests edlib_static)
+ include(CTest)
+ if (BUILD_TESTING)
=====================================
debian/patches/enable_shared_and_static.patch
=====================================
@@ -0,0 +1,54 @@
+Description: Enable building both shared and static library for d-shlibs
+Author: Nilesh Patra <npatra974 at gmail.com>
+Forwarded: not-needed
+Last-Update: 2021-01-08
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,6 @@
+ set(CMAKE_CXX_STANDARD_REQUIRED ON) # Falling back to different standard it not allowed.
+ set(CMAKE_CXX_EXTENSIONS OFF) # Make sure no compiler-specific features are used.
+
+-# Build edlib as static library by default
+-set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build all libraries as shared")
+-
+ # Set strict warnings.
+ if(MSVC)
+ # Force to always compile with W4
+@@ -47,13 +44,20 @@
+ file(GLOB SOURCES "edlib/src/*.cpp")
+
+ # Create libraries.
+-add_library(edlib ${SOURCES})
++add_library(edlib SHARED ${SOURCES})
++
++target_include_directories(edlib PUBLIC
++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/edlib/include>
++ $<INSTALL_INTERFACE:include>)
++
++add_library(edlib_static STATIC ${SOURCES})
++
+ set_target_properties(edlib
+ PROPERTIES
+ VERSION ${PROJECT_VERSION}
+ SOVERSION ${PROJECT_VERSION})
+
+-target_include_directories(edlib PUBLIC
++target_include_directories(edlib_static PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/edlib/include>
+ $<INSTALL_INTERFACE:include>)
+
+@@ -71,12 +75,12 @@
+
+ if (NOT WIN32) # If on windows, do not build binaries that do not support windows.
+ add_executable(edlib-aligner apps/aligner/aligner.cpp)
+- target_link_libraries(edlib-aligner edlib)
++ target_link_libraries(edlib-aligner edlib_static)
+ endif()
+
+
+ # Create target 'install' for installing libraries.
+-install(TARGETS edlib DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS edlib edlib_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES edlib/include/edlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ # configure and install pkg-config file
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,5 @@
# soversion.patch
-# do_not_build_hello_example.patch
+do_not_build_hello_example.patch
cython3.patch
# signed_char.patch
+enable_shared_and_static.patch
=====================================
debian/rules
=====================================
@@ -33,7 +33,8 @@ override_dh_install:
--devunversioned \
--exclude-la \
--movedev debian/tmp/usr/include/* usr/include \
- debian/tmp/usr/lib/*.so
+ --movedev debian/tmp/usr/lib/*/pkgconfig usr/lib/$(DEB_HOST_MULTIARCH) \
+ debian/tmp/usr/lib/*/*.so
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
View it on GitLab: https://salsa.debian.org/med-team/libedlib/-/compare/817a527f412014bfb0052b717b47f52429c30210...b0c302fa9fa0a1a4660c2f45e125b3cbc4fb1288
--
View it on GitLab: https://salsa.debian.org/med-team/libedlib/-/compare/817a527f412014bfb0052b717b47f52429c30210...b0c302fa9fa0a1a4660c2f45e125b3cbc4fb1288
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/20210108/196af333/attachment-0001.html>
More information about the debian-med-commit
mailing list