diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/patches/mosaicatcher-unbundle-htslib.patch | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.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 |