aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-11-08 09:46:42 +0100
committerRicardo Wurmus <rekado@elephly.net>2018-11-08 09:46:42 +0100
commit86c6928ea39aff622124030c20404ce94dae9b49 (patch)
treeb311c3a88eac9cad288a6da6cc493888243a356e
parent15c9609482aa26bd179d1316dcf62f6292223c96 (diff)
downloadguix-86c6928ea39aff622124030c20404ce94dae9b49.tar
guix-86c6928ea39aff622124030c20404ce94dae9b49.tar.gz
gnu: vsearch: Update to 2.9.1.
* gnu/packages/bioinformatics.scm (vsearch): Update to 2.9.1. * gnu/packages/patches/vsearch-unbundle-cityhash.patch: Update.
-rw-r--r--gnu/packages/bioinformatics.scm4
-rw-r--r--gnu/packages/patches/vsearch-unbundle-cityhash.patch6
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 9954fcf20b..d9362ea4c6 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -6825,7 +6825,7 @@ SELECT or UPDATE queries to an end-point.")
(define-public vsearch
(package
(name "vsearch")
- (version "2.8.0")
+ (version "2.9.1")
(source
(origin
(method git-fetch)
@@ -6835,7 +6835,7 @@ SELECT or UPDATE queries to an end-point.")
(file-name (git-file-name name version))
(sha256
(base32
- "0lrw6n75gmqkxl053yi2pwwvnzwf1r79ypzxgv6m0kw6df5fwv6r"))
+ "0vhrpjfdf75ba04b24xknp41790cvcgwl0vgpy7qbzj5xh2521ss"))
(patches (search-patches "vsearch-unbundle-cityhash.patch"))
(snippet
'(begin
diff --git a/gnu/packages/patches/vsearch-unbundle-cityhash.patch b/gnu/packages/patches/vsearch-unbundle-cityhash.patch
index b1ecb1f063..2a2ab13a73 100644
--- a/gnu/packages/patches/vsearch-unbundle-cityhash.patch
+++ b/gnu/packages/patches/vsearch-unbundle-cityhash.patch
@@ -6,7 +6,7 @@ index e56a8a2..4adcc48 100644
if TARGET_PPC
AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -mcpu=power8
else
--AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g
+-AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -march=x86-64 -mtune=generic
+AM_CXXFLAGS=-Wall -Wsign-compare -O3 -g -lcityhash
endif
@@ -39,7 +39,7 @@ index e56a8a2..4adcc48 100644
-
if TARGET_WIN
--libcityhash_a_CXXFLAGS = -Wall -Wno-sign-compare -O3 -g -D_MSC_VER
+-libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare -D_MSC_VER
-__top_builddir__bin_vsearch_LDFLAGS = -static
-__top_builddir__bin_vsearch_LDADD = libregex.a libcityhash.a libcpu_ssse3.a libcpu_sse2.a
+__top_builddir__bin_vsearch_LDFLAGS = -static -lcityhash
@@ -47,7 +47,7 @@ index e56a8a2..4adcc48 100644
else
--libcityhash_a_CXXFLAGS = -Wall -Wno-sign-compare -O3 -g
+-libcityhash_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-sign-compare
-
if TARGET_PPC
-__top_builddir__bin_vsearch_LDADD = libcityhash.a libcpu.a