summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordarmac <xiaojun2@hisilicon.com>2020-07-14 19:02:31 +0800
committerGitHub <noreply@github.com>2020-07-14 13:02:31 +0200
commitfa614404e6522273ec54ac5f7d7b88bd8a093152 (patch)
tree347aad854af5688743ec147e08dd12ccad8a7aa8
parenta6abd530bdbd426cf866cc5689b3a0162d8f7e78 (diff)
downloadspack-fa614404e6522273ec54ac5f7d7b88bd8a093152.tar.gz
spack-fa614404e6522273ec54ac5f7d7b88bd8a093152.tar.bz2
spack-fa614404e6522273ec54ac5f7d7b88bd8a093152.tar.xz
spack-fa614404e6522273ec54ac5f7d7b88bd8a093152.zip
smartdenovo: added patch to fix compile error (debian) (#17435)
-rw-r--r--var/spack/repos/builtin/packages/smartdenovo/inline-limit.patch24
-rw-r--r--var/spack/repos/builtin/packages/smartdenovo/package.py4
2 files changed, 26 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/smartdenovo/inline-limit.patch b/var/spack/repos/builtin/packages/smartdenovo/inline-limit.patch
new file mode 100644
index 0000000000..9a42bd29cd
--- /dev/null
+++ b/var/spack/repos/builtin/packages/smartdenovo/inline-limit.patch
@@ -0,0 +1,24 @@
+diff -Nur smartdenovo/wtlay.h smartdenovo-new/wtlay.h
+--- smartdenovo/wtlay.h 2020-07-09 02:47:13.503412360 +0800
++++ smartdenovo-new/wtlay.h 2020-07-09 02:49:02.775412360 +0800
+@@ -503,17 +503,17 @@
+ return e2;
+ }
+
+-inline int cut_biedge_strgraph_core(StringGraph *g, uint32_t node_id, int dir, uint32_t eidx, int closed){
++static inline int cut_biedge_strgraph_core(StringGraph *g, uint32_t node_id, int dir, uint32_t eidx, int closed){
+ edge_strgraph(g, node_id, dir, eidx)->closed = closed;
+ edge_partner_strgraph(g, node_id, dir, eidx)->closed = closed;
+ return 1;
+ }
+
+-inline int cut_biedge_strgraph(StringGraph *g, uint32_t node_id, int dir, uint32_t eidx){
++static inline int cut_biedge_strgraph(StringGraph *g, uint32_t node_id, int dir, uint32_t eidx){
+ return cut_biedge_strgraph_core(g, node_id, dir, eidx, 1);
+ }
+
+-inline int cut_biedge_strgraph2(StringGraph *g, uint32_t node_id, int dir, uint32_t eidx){
++static inline int cut_biedge_strgraph2(StringGraph *g, uint32_t node_id, int dir, uint32_t eidx){
+ return cut_biedge_strgraph_core(g, node_id, dir, eidx, 2);
+ }
+
diff --git a/var/spack/repos/builtin/packages/smartdenovo/package.py b/var/spack/repos/builtin/packages/smartdenovo/package.py
index f18b8583d9..48109ea9e4 100644
--- a/var/spack/repos/builtin/packages/smartdenovo/package.py
+++ b/var/spack/repos/builtin/packages/smartdenovo/package.py
@@ -17,8 +17,8 @@ class Smartdenovo(MakefilePackage):
depends_on('sse2neon', when='target=aarch64:')
- patch('aarch64.patch', when='target=aarch64:',
- sha256='7dd4bca28aafb0680cc1823aa58ac9000819993538e92628554666c4b3acc470')
+ patch('aarch64.patch', sha256='7dd4bca28aafb0680cc1823aa58ac9000819993538e92628554666c4b3acc470', when='target=aarch64:')
+ patch('inline-limit.patch', sha256='9f514ed72c37cf52ee2ffbe06f9ca1ed5a3e0819dab5876ecd83107c5e5bed81')
def install(self, spec, prefix):
install_files = [