[med-svn] [Git][med-team/ismrmrd][master] Add static library

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ismrmrd


Commits:
6303154f by Andreas Tille at 2020-09-20T08:28:02+02:00
Add static library

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/libismrmrd-dev.install
- − debian/libismrmrd1.3.install
- + debian/patches/add_static_lib.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
 ismrmrd (1.4.2.1-1) UNRELEASED; urgency=medium
 
+  [ Nilesh Patra ]
   * Team Upload.
   * New upstream version 1.4.2.1
   * Fix install dirs
@@ -16,6 +17,10 @@ ismrmrd (1.4.2.1-1) UNRELEASED; urgency=medium
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
     Repository-Browse.
 
+  [ Andreas Tille ]
+  * Add static library
+  * Use d-shlibs
+
  -- Nilesh Patra <npatra974 at gmail.com>  Sun, 20 Sep 2020 02:35:46 +0530
 
 ismrmrd (1.4.0-1) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -5,6 +5,8 @@ Section: science
 Priority: optional
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               d-shlibs,
+               rename,
                libboost-program-options-dev,
                libboost-test-dev,
                libfftw3-dev,
@@ -17,7 +19,7 @@ Vcs-Git: https://salsa.debian.org/med-team/ismrmrd.git
 Homepage: https://ismrmrd.github.io/
 Rules-Requires-Root: no
 
-Package: libismrmrd1.3
+Package: libismrmrd1.4
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -41,7 +43,7 @@ Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libhdf5-dev,
-         libismrmrd1.3 (= ${binary:Version})
+         libismrmrd1.4 (= ${binary:Version})
 Suggests: libismrmrd-doc
 Description: development files for ISMRMRD
  The ISMRMRD format combines a mix of flexible data structures (XML header)


=====================================
debian/libismrmrd-dev.install
=====================================
@@ -1,4 +1,3 @@
 usr/include/ismrmrd
-usr/lib/*/*.so
 usr/lib/cmake
 usr/share/*/cmake


=====================================
debian/libismrmrd1.3.install deleted
=====================================
@@ -1 +0,0 @@
-usr/lib/*/*.so.*


=====================================
debian/patches/add_static_lib.patch
=====================================
@@ -0,0 +1,36 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sun, 20 Sep 2020 08:09:49 +0200
+Description: Add static library
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,6 +195,7 @@ endif ()
+ # main library
+ include_directories(${ISMRMRD_TARGET_INCLUDE_DIRS})
+ add_library(ismrmrd SHARED ${ISMRMRD_TARGET_SOURCES})
++add_library(ismrmrd_static STATIC ${ISMRMRD_TARGET_SOURCES})
+ add_library(ismrmrd::ismrmrd ALIAS ismrmrd)
+ set_target_properties(ismrmrd PROPERTIES
+   VERSION ${ISMRMRD_VERSION_STRING}
+@@ -205,8 +206,13 @@ set_target_properties(ismrmrd
+   PROPERTIES
+   EXPORT_NAME ISMRMRD
+   INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include>)
++set_target_properties(ismrmrd_static
++  PROPERTIES
++  EXPORT_NAME ISMRMRD
++  INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include>)
+ 
+ target_link_libraries(ismrmrd ${ISMRMRD_TARGET_LINK_LIBS})
++target_link_libraries(ismrmrd_static ${ISMRMRD_TARGET_LINK_LIBS})
+ list(APPEND ISMRMRD_LIBRARIES ismrmrd) # Add to list of libraries to be found
+ list(APPEND ISMRMRD_LIBRARY_DIRS ${CMAKE_BINARY_DIR} ) # Add to list of directories to find libraries
+ 
+@@ -219,6 +225,7 @@ install(TARGETS ismrmrd EXPORT ISMRMRDTa
+    RUNTIME DESTINATION bin
+    COMPONENT Devel
+ )
++install(TARGETS ismrmrd_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ # install the headers
+ install(DIRECTORY include/ismrmrd  DESTINATION include COMPONENT Devel)


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ Disable-HTML-timestamps.patch
 Use-explicit-64-bit-shifts-in-testsuite.patch
 Add-support-for-multiarch.patch
 remove-travis-build-status.patch
+add_static_lib.patch


=====================================
debian/rules
=====================================
@@ -19,6 +19,17 @@ override_dh_auto_configure:
 override_dh_auto_build-indep:
 	dh_auto_build -- apidoc
 
+override_dh_install-arch:
+	dh_install -a
+	# FIXME: If you know how to rename the static lib inside debian/patches/add_static_lib.patch that would be better than this hack
+	file-rename 's/_static\.a/.a/' `find debian -name libismrmrd_static.a`
+	d-shlibmove --commit \
+		    --multiarch \
+		    --devunversioned \
+		    --exclude-la \
+		    debian/tmp/usr/lib/*/*.so
+	find debian -name "lib*.la" -delete
+
 override_dh_auto_installdocs-indep:
 	dh_installdocs --indep
 	dh_doxygen --indep



View it on GitLab: https://salsa.debian.org/med-team/ismrmrd/-/commit/6303154fe400e33ae86ae14a34243bc08f6c8f08

-- 
View it on GitLab: https://salsa.debian.org/med-team/ismrmrd/-/commit/6303154fe400e33ae86ae14a34243bc08f6c8f08
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/20200920/b82dbd39/attachment-0001.html>