[med-svn] [Git][med-team/spoa][master] 2 commits: Fix build

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / spoa


Commits:
449d6045 by Andreas Tille at 2018-06-09T14:11:44+02:00
Fix build

- - - - -
2db4688b by Andreas Tille at 2018-06-09T14:12:21+02:00
DEP3

- - - - -


3 changed files:

- debian/control
- debian/patches/shared_and_static.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Priority: optional
 Build-Depends: debhelper (>= 11~),
                cmake,
                d-shlibs,
+               rename,
                libbioparser-dev
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/med-team/spoa


=====================================
debian/patches/shared_and_static.patch
=====================================
--- a/debian/patches/shared_and_static.patch
+++ b/debian/patches/shared_and_static.patch
@@ -1,3 +1,7 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update:  Fri, 08 Jun 2018 13:20:51 +0200
+Description: Build shared and static lib
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -16,9 +16,15 @@ option(spoa_build_executable "Build spoa
@@ -18,7 +22,7 @@
      src/alignment_engine.cpp
      src/graph.cpp
      src/simd_alignment_engine.cpp
-@@ -28,6 +34,10 @@ target_include_directories(spoa PUBLIC
+@@ -28,12 +34,17 @@ target_include_directories(spoa PUBLIC
      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
      $<INSTALL_INTERFACE:include>)
  
@@ -29,3 +33,10 @@
  set_target_properties(spoa
      PROPERTIES
      VERSION ${spoa_VERSION}
+     SOVERSION ${spoa_VERSION})
+ 
+ install(TARGETS spoa DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS spoa_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/spoa DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ # configure and install pkg-config file


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -14,10 +14,11 @@ override_dh_auto_configure:
 
 override_dh_install:
 	dh_install
+	file-rename 's/_static\.a/.a/' `find debian -name libspoa_static.a`
 	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
 		    --movedev debian/tmp/usr/include/* usr/include \
-		    --movedev debian/tmp/usr/lib/*/cmake usr/lib/$(DEB_HOST_MULTIARCH) \
+		    --movedev debian/tmp/usr/lib/*/pkgconfig usr/lib/$(DEB_HOST_MULTIARCH) \
 		    debian/tmp/usr/lib/*/*.so



View it on GitLab: https://salsa.debian.org/med-team/spoa/compare/6ce0c36a32b696cc8e13e394a1c21b20c4a844bf...2db4688bf392455991b9d6eb9387b8193bff640a

-- 
View it on GitLab: https://salsa.debian.org/med-team/spoa/compare/6ce0c36a32b696cc8e13e394a1c21b20c4a844bf...2db4688bf392455991b9d6eb9387b8193bff640a
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/20180609/a8ab8a79/attachment-0001.html>