diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/patches/mosaicatcher-unbundle-htslib.patch | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.zip | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/patches/mosaicatcher-unbundle-htslib.patch')
| -rw-r--r-- | gnu/packages/patches/mosaicatcher-unbundle-htslib.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/gnu/packages/patches/mosaicatcher-unbundle-htslib.patch b/gnu/packages/patches/mosaicatcher-unbundle-htslib.patch new file mode 100644 index 0000000000..262895ddcf --- /dev/null +++ b/gnu/packages/patches/mosaicatcher-unbundle-htslib.patch @@ -0,0 +1,49 @@ +--- a/src/CMakeLists.txt 2021-05-28 13:07:25.655107983 +0200 ++++ b/src/CMakeLists.txt 2021-05-28 13:09:55.764025497 +0200 +@@ -21,24 +21,6 @@ + + + +-### Link HTSlib +- +-ExternalProject_Add(htslib +- PREFIX ${CMAKE_BINARY_DIR}/htslib +- GIT_REPOSITORY "https://github.com/samtools/htslib.git" +- GIT_TAG "1.3.1" +- UPDATE_COMMAND "" +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND "" +- BUILD_COMMAND make +- INSTALL_COMMAND make install prefix=${CMAKE_BINARY_DIR}/htslib +- LOG_DOWNLOAD 1 +-) +-link_directories (${CMAKE_BINARY_DIR}/htslib/lib) +-include_directories (${CMAKE_BINARY_DIR}/htslib/include) +- +- +- + ### Set version + + # Get the current working branch +@@ -64,13 +46,6 @@ + + # 2. Boost version from find_package (Boost_VERSION) + +-# 3. Get HTSlib version from git +-execute_process( +- COMMAND git describe --always +- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/htslib +- OUTPUT_VARIABLE HTSLIB_VERSION +- OUTPUT_STRIP_TRAILING_WHITESPACE +-) + set(HTSLIB_VERSION "1.3.1 ${HTSLIB_VERSION}") + + # 4. write version.hpp file +@@ -105,7 +80,6 @@ + add_executable (mosaic main.cpp ${HEADER_FILES}) + target_link_libraries (mosaic LINK_PUBLIC ${Boost_LIBRARIES}) + target_link_libraries (mosaic LINK_PUBLIC hts) +-add_dependencies (mosaic htslib) + + + ### Doxygen API documentation |