aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2021-12-09 11:48:15 +0100
committerRicardo Wurmus <rekado@elephly.net>2021-12-09 11:50:10 +0100
commit0bf3c9abaa1d069421575b5af6a49dae950736bf (patch)
treeda06de22878bc4b458d35ed93f10c0a28c77e7a4 /gnu/packages/patches
parentab445eb4b7f0444c1f390e2839fe8a2bce1719f5 (diff)
downloadguix-0bf3c9abaa1d069421575b5af6a49dae950736bf.tar
guix-0bf3c9abaa1d069421575b5af6a49dae950736bf.tar.gz
gnu: metabat: Update to 2.15.
* gnu/packages/bioinformatics.scm (metabat): Update to 2.15. [source]: Remove patch. [build-system]: Use cmake-build-system. [arguments]: Adjust to new build system. * gnu/packages/patches/metabat-fix-compilation.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/metabat-fix-compilation.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/gnu/packages/patches/metabat-fix-compilation.patch b/gnu/packages/patches/metabat-fix-compilation.patch
deleted file mode 100644
index 7086a96e86..0000000000
--- a/gnu/packages/patches/metabat-fix-compilation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-This patch changes metabat so that (1) it is not build statically, (2) it uses
-shared libraries rather than static libraries where possible.
-
-diff --git a/SConstruct b/SConstruct
-index 69cdc0a..ac99bcb 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -26,8 +26,6 @@ debug = ARGUMENTS.get('DEBUG', None)
- build_flags = ['-Wall', '-g', '-std=c++11', '-fopenmp']
- link_flags = ['-lstdc++', '-lm', '-fopenmp']
-
--if platform.platform(True, True).find('Darwin') == -1:
-- link_flags.extend(['-static', '-static-libgcc', '-static-libstdc++'])
-
- if debug is None:
- build_flags.extend(['-O3', '-DNDEBUG', '-Wno-unknown-pragmas', '-Wno-deprecated-declarations', '-Wno-overflow', '-Wno-unused-variable'])
-@@ -110,17 +108,17 @@ def findStaticOrShared( lib, testPaths, static_source_list, link_flag_list, stat
- for path in testPaths:
- if not os.path.isdir(path):
- continue
-+ for testfile in ('%s/lib%s.so' % (path, lib), '%s/lib%s.dylib' % (path, lib)):
-+ if os.path.isfile(testfile):
-+ print "Found shared library %s as %s" % (lib, testfile)
-+ link_flag_list.extend( ["-L%s" % (path), "-l%s" % (lib) ] )
-+ return
- for suffix in staticSuffixes:
- testfile = '%s/lib%s%s' % (path, lib, suffix)
- if os.path.isfile(testfile):
- static_source_list.append(testfile)
- print "Found static library %s as %s" % (lib, testfile)
- return
-- for testfile in ('%s/lib%s.so' % (path, lib), '%s/lib%s.dylib' % (path, lib)):
-- if os.path.isfile(testfile):
-- print "Found shared library %s as %s" % (lib, testfile)
-- link_flag_list.extend( ["-L%s" % (path), "-l%s" % (lib) ] )
-- return
- print "Could not find library for %s!!! Looked in %s" % (lib, testPaths)
- return
-