Andreas Tille pushed to branch master at Debian Med / strelka
Commits: db7dcedd by Andreas Tille at 2020-05-15T14:19:26+02:00 TODO: Prevent cmake from checking whether install can write to /usr - - - - - 4 changed files: - debian/changelog - debian/control - debian/patches/use_debian_packaged_redist.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,6 @@ strelka (2.9.10+dfsg-1) UNRELEASED; urgency=medium * Initial release (Closes: #<bug>) + TODO: Prevent cmake from checking whether install can write to /usr -- Andreas Tille <[email protected]> Wed, 13 May 2020 16:55:22 +0200 ===================================== debian/control ===================================== @@ -27,7 +27,8 @@ Homepage: https://github.com/Illumina/strelka/ Package: strelka Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + ${python3:Depends} Description: strelka2 germline and somatic small variant caller Strelka2 is a fast and accurate small variant caller optimized for analysis of germline variation in small cohorts and somatic variation in ===================================== debian/patches/use_debian_packaged_redist.patch ===================================== @@ -104,3 +104,18 @@ Description: Use Debian packaged libs message(STATUS "Detected workflow version: ${WORKFLOW_VERSION}") file(WRITE ${CONFIG_FILE} "WORKFLOW_VERSION\t${WORKFLOW_VERSION}\n") +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -189,9 +189,9 @@ check_prefix() + + # paths for binary components -- we don't currently change this from the non-binary components + set(THIS_EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}") +-set(THIS_BINDIR "${THIS_EXEC_PREFIX}/bin") +-set(THIS_LIBDIR "${THIS_EXEC_PREFIX}/lib") +-set(THIS_LIBEXECDIR "${THIS_EXEC_PREFIX}/libexec") ++set(THIS_BINDIR "${CMAKE_INSTALL_PREFIX}/bin") ++set(THIS_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") ++set(THIS_LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/libexec") + + # paths w/o architecture dependency + set(THIS_PYTHON_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/python") ===================================== debian/rules ===================================== @@ -20,6 +20,8 @@ include /usr/share/dpkg/default.mk CMAKE_EXTRA_FLAGS += -DDEBIAN_BUILD=1 \ -DWORKFLOW_VERSION=$(DEB_VERSION_UPSTREAM) +# -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/tmp + %: dh $@ --buildsystem=cmake View it on GitLab: https://salsa.debian.org/med-team/strelka/-/commit/db7dcedd9656926d870a2b46b8c597e49f1a9be7 -- View it on GitLab: https://salsa.debian.org/med-team/strelka/-/commit/db7dcedd9656926d870a2b46b8c597e49f1a9be7 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
