Andreas Tille pushed to branch master at Debian Med / iitii
Commits: 7f838f2c by Andreas Tille at 2020-06-05T22:30:07+02:00 Continue packaging needed libraries - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/series - + debian/patches/use_debian_packaged_libs.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,6 +1,6 @@ iitii (0.0+git20191030.85209e0-1) UNRELEASED; urgency=medium * Initial release (Closes: #<bug>) - TODO: https://github.com/vgteam/ips4o.git + TODO: https://github.com/ekg/mmap_allocator -- Andreas Tille <[email protected]> Fri, 05 Jun 2020 17:53:54 +0200 ===================================== debian/control ===================================== @@ -4,7 +4,9 @@ Uploaders: Andreas Tille <[email protected]> Section: science Priority: optional Build-Depends: debhelper-compat (= 13), - cmake + cmake, + libips4o-dev, + libargs-dev Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/med-team/iitii Vcs-Git: https://salsa.debian.org/med-team/iitii.git ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +use_debian_packaged_libs.patch ===================================== debian/patches/use_debian_packaged_libs.patch ===================================== @@ -0,0 +1,22 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Fri, 05 Jun 2020 17:53:54 +0200 +Description: Use Debian packaged libraries + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,6 +66,7 @@ include(${CMAKE_ROOT}/Modules/ExternalPr + # We need to NOT blank out UPDATE_COMMAND or we can never change the Git revision we point to. + # The cost of this is that we have to re-configure on every build if we do update. + ++if(!DEBIAN_BUILD) + # In-place Parallel Super Scalar Samplesort (IPS⁴o), header only + ExternalProject_Add(ips4o + GIT_REPOSITORY "https://github.com/vgteam/ips4o.git"; +@@ -85,6 +86,7 @@ ExternalProject_Add(tayweeargs + INSTALL_COMMAND "") + ExternalProject_Get_property(tayweeargs SOURCE_DIR) + set(tayweeargs_INCLUDE "${SOURCE_DIR}") ++endif() + + ExternalProject_Add(mmap_allocator + GIT_REPOSITORY "https://github.com/ekg/mmap_allocator.git"; ===================================== debian/rules ===================================== @@ -17,6 +17,8 @@ include /usr/share/dpkg/default.mk # for hardening you might like to uncomment this: # export DEB_BUILD_MAINT_OPTIONS=hardening=+all +CMAKE_EXTRA_FLAGS += -DDEBIAN_BUILD=1 + %: dh $@ @@ -25,7 +27,3 @@ include /usr/share/dpkg/default.mk #ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # do_stuff_for_testing #endif - -### If you **really** can not use uscan (even not with mode=git) use a debian/get-orig-script -#get-orig-source: -# . debian/get-orig-source View it on GitLab: https://salsa.debian.org/med-team/iitii/-/commit/7f838f2ca2986e0f69b6bae4a50edf7008130215 -- View it on GitLab: https://salsa.debian.org/med-team/iitii/-/commit/7f838f2ca2986e0f69b6bae4a50edf7008130215 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
