From a05dcac35e7715f0ebd113ff5e1c2fb2bbc0dce9 Mon Sep 17 00:00:00 2001 From: Maarten-vd-Sande Date: Sat, 11 Jul 2020 11:51:09 +0200 Subject: [PATCH] [ci skip] Merge PR 23102 Merge PR #23102, commits were: * bwa-mem2: skip osx due to https://github.com/intel/safestringlib/issues/14 * bwa-mem2: fix source,patch,make,multi,license,doi * try as libs * try/use makefile patch * allow zlib * use cpp compiler * more lint * some lint * try building from source * ignore some lint * add libgcc * rename to bwa-mem2 * rename bwamem2 to bwa-mem2 * move all related files * noarch generic * Merge branch 'master' into bwamem2 * add bwa-mem2 --- ...7692aeb857d5b9241a08bbd68f2c6be01811.patch | 22 +++++++++ recipes/bwa-mem2/Makefile.patch | 15 +++++++ recipes/bwa-mem2/build.sh | 6 +++ recipes/bwa-mem2/meta.yaml | 45 +++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 recipes/bwa-mem2/771c7692aeb857d5b9241a08bbd68f2c6be01811.patch create mode 100644 recipes/bwa-mem2/Makefile.patch create mode 100644 recipes/bwa-mem2/build.sh create mode 100644 recipes/bwa-mem2/meta.yaml diff --git a/recipes/bwa-mem2/771c7692aeb857d5b9241a08bbd68f2c6be01811.patch b/recipes/bwa-mem2/771c7692aeb857d5b9241a08bbd68f2c6be01811.patch new file mode 100644 index 0000000000000..2156e02f4680b --- /dev/null +++ b/recipes/bwa-mem2/771c7692aeb857d5b9241a08bbd68f2c6be01811.patch @@ -0,0 +1,22 @@ +From 08e70563012725edc8d130c24237b25f9ba1262f Mon Sep 17 00:00:00 2001 +From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com> +Date: Thu, 9 Jul 2020 17:51:39 +0200 +Subject: [PATCH] Fix version to be correct + +--- + src/main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.cpp b/src/main.cpp +index 0fb8211..cd34830 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -32,7 +32,7 @@ Contacts: Vasimuddin Md ; Sanchit Misra