summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2016-01-14 14:36:32 +0100
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2016-01-14 14:43:25 +0100
commit0047d26a220805a99c84d9b87c73e012a63919e1 (patch)
tree1428f2e8a83d00279caf7b0b9f90afb5442c45f7 /gnu/packages/patches
parent2d12284d389df5cbe05c7162397b929d9a4dbee6 (diff)
downloadguix-0047d26a220805a99c84d9b87c73e012a63919e1.tar.gz
gnu: bowtie: Update to 2.2.6.
* gnu/packages/bioinformatics.scm (bowtie): Update to 2.2.6.
[source]: Remove patch; do not set CC and CPP variables.
[inputs]: Add "tbb".
[arguments]: Pass "prefix" and "WITH_TBB" make flags; remove custom
"install" phase.
* gnu/packages/patches/bowtie-fix-makefile.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove patch file.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/bowtie-fix-makefile.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/gnu/packages/patches/bowtie-fix-makefile.patch b/gnu/packages/patches/bowtie-fix-makefile.patch
deleted file mode 100644
index 5ac65731cb..0000000000
--- a/gnu/packages/patches/bowtie-fix-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4a99b0023bdfbbe486b9649489a32ea184c18c9a Mon Sep 17 00:00:00 2001
-From: Valentin Antonescu <valentin@jhu.edu>
-Date: Tue, 2 Dec 2014 11:19:13 -0500
-Subject: [PATCH] Make sure the Mavericks test happens only under Darwin.
-
----
- Makefile | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d74f7c8..a4cdfa7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -54,12 +54,11 @@ endif
- MACOS = 0
- ifneq (,$(findstring Darwin,$(shell uname)))
- 	MACOS = 1
--endif
--
--ifneq (,$(findstring 13,$(shell uname -r)))
--	CPP = clang++
--	CC = clang
--	EXTRA_FLAGS += -stdlib=libstdc++
-+	ifneq (,$(findstring 13,$(shell uname -r)))
-+		CPP = clang++
-+		CC = clang
-+		EXTRA_FLAGS += -stdlib=libstdc++
-+	endif
- endif
- 
- POPCNT_CAPABILITY ?= 1