update to verkko v2.2.1

bioconda · Oct 2, 2024 · 9f2717f · 9f2717f
1 parent 94446b6
commit 9f2717f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 75 deletions.
diff --git a/recipes/verkko/meta.yaml b/recipes/verkko/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "verkko" %}
-{% set version = "2.2" %}
+{% set version = "2.2.1" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://github.com/marbl/{{ name }}/releases/download/v{{ version }}/{{ name }}-v{{ version }}.tar.gz
-  sha256: 77a6c8e041bc7dd61f724dcafa6ce6bf1ddc3aed163d17536e9612824293cfba
+  sha256: 4ab40961352cac22eebfb37606c82bb5a589f9361c36430e7278227e62db3860
 
   patches:
     - osx_availability.patch # [osx]

diff --git a/recipes/verkko/osx_availability.patch b/recipes/verkko/osx_availability.patch
@@ -1,43 +1,3 @@
-diff --git a/src/Makefile.boilermake b/src/Makefile.boilermake
-index 7e2b929..2dfc3b1 100644
---- a/src/Makefile.boilermake
-+++ b/src/Makefile.boilermake
-@@ -160,11 +160,18 @@ endef
- define ADD_FILE_COPY_RULE
-   doall: $${TARGET_DIR}/$2
-   ifeq ($3,executable)
-+  ifeq ($(suffix $(1)),.sh)
-   $${TARGET_DIR}/$2: $1
- 		@mkdir -p $$(dir $${TARGET_DIR}/$2)
- 		cat $1 |sed s/'version=""'/'version="$(VERSION)"'/g > $${TARGET_DIR}/$2
- 		chmod +x $${TARGET_DIR}/$2
-   else
-+  $${TARGET_DIR}/$2: $1
-+		@mkdir -p $$(dir $${TARGET_DIR}/$2)
-+		cp $1 $${TARGET_DIR}/$2
-+		chmod +x $${TARGET_DIR}/$2
-+  endif
-+  else
-   $${TARGET_DIR}/$2: $1
- 		@mkdir -p $$(dir $${TARGET_DIR}/$2)
- 		cp -pf $1 $${TARGET_DIR}/$2
-diff --git a/src/Makefile b/src/Makefile
-index 67975ff..6a0d332 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -127,9 +127,9 @@ define SET_DEFAULT_FLAGS
-   else
-     TOOLCHAIN  := LLVM
-     TOOLCHAINV := $$(shell ${CXX} -dumpversion)
--    CFLAGS     := -pthread -fopenmp -fPIC -std=c17   ${1}
--    CXXFLAGS   := -pthread -fopenmp -fPIC -std=c++20 ${1}
--    LDFLAGS    := -pthread -fopenmp                  ${2} -lm
-+    CFLAGS     := -DBOOST_NO_CXX98_FUNCTION_BASE -pthread -fopenmp -fPIC -std=c17   ${1}
-+    CXXFLAGS   := -DBOOST_NO_CXX98_FUNCTION_BASE -pthread -fopenmp -fPIC -std=c++20 ${1}
-+    LDFLAGS    := -DBOOST_NO_CXX98_FUNCTION_BASE -pthread -fopenmp                  ${2} -lm
-   endif
-
-   #  Build up our preferred set of flags.
 diff --git a/src/MBG/makefile b/src/MBG/makefile
 index 0c0113b..c6fd847 100644
 --- a/src/MBG/makefile

diff --git a/recipes/verkko/version.patch b/recipes/verkko/version.patch