1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
Author: Michael R. Crusoe <crusoe@debian.org>
Description: ignore broken GCC version check
Forwarded: not-needed
--- canu.orig/src/Makefile
+++ canu/src/Makefile
@@ -465,7 +465,7 @@
CXXFLAGS += -pthread -fopenmp -fPIC
LDFLAGS += -pthread -fopenmp -lm
- LDLIBS += -lsnappy
+ LDLIBS += -lsnappy -lbacktrace
BUILDSTACKTRACE ?= 1
endif
@@ -649,15 +649,6 @@
endif
ifeq (${BUILDSTACKTRACE}, 1)
-ifeq (${GXX_45}, 0)
-$(info WARNING:)
-$(info WARNING: ${CXX} ${GXX_VV} detected, disabling stack trace support. Please upgrade to GCC 4.7 or higher.)
-$(info WARNING:)
-BUILDSTACKTRACE = 0
-endif
-endif
-
-ifeq (${BUILDSTACKTRACE}, 1)
CXXFLAGS += -DLIBBACKTRACE
else
CXXFLAGS += -DNOBACKTRACE
--- canu.orig/src/meryl/src/Makefile
+++ canu/src/meryl/src/Makefile
@@ -630,15 +630,6 @@
endif
ifeq (${BUILDSTACKTRACE}, 1)
-ifeq (${GXX_45}, 0)
-$(info WARNING:)
-$(info WARNING: ${CXX} ${GXX_VV} detected, disabling stack trace support. Please upgrade to GCC 4.7 or higher.)
-$(info WARNING:)
-BUILDSTACKTRACE = 0
-endif
-endif
-
-ifeq (${BUILDSTACKTRACE}, 1)
CXXFLAGS += -DLIBBACKTRACE
else
CXXFLAGS += -DNOBACKTRACE
--- canu.orig/src/seqrequester/src/Makefile
+++ canu/src/seqrequester/src/Makefile
@@ -647,15 +647,6 @@
endif
ifeq (${BUILDSTACKTRACE}, 1)
-ifeq (${GXX_45}, 0)
-$(info WARNING:)
-$(info WARNING: ${CXX} ${GXX_VV} detected, disabling stack trace support. Please upgrade to GCC 4.7 or higher.)
-$(info WARNING:)
-BUILDSTACKTRACE = 0
-endif
-endif
-
-ifeq (${BUILDSTACKTRACE}, 1)
CXXFLAGS += -DLIBBACKTRACE
else
CXXFLAGS += -DNOBACKTRACE
--- canu.orig/src/utility/src/Makefile
+++ canu/src/utility/src/Makefile
@@ -674,15 +674,6 @@
endif
ifeq (${BUILDSTACKTRACE}, 1)
-ifeq (${GXX_45}, 0)
-$(info WARNING:)
-$(info WARNING: ${CXX} ${GXX_VV} detected, disabling stack trace support. Please upgrade to GCC 4.7 or higher.)
-$(info WARNING:)
-BUILDSTACKTRACE = 0
-endif
-endif
-
-ifeq (${BUILDSTACKTRACE}, 1)
CXXFLAGS += -DLIBBACKTRACE
else
CXXFLAGS += -DNOBACKTRACE
--- canu.orig/src/utility/src/utility/system-stackTrace.C
+++ canu/src/utility/src/utility/system-stackTrace.C
@@ -57,7 +57,7 @@
#elif defined(LIBBACKTRACE)
extern "C" {
-#include "libbacktrace/backtrace.h"
+#include "backtrace.h"
}
backtrace_state *backtraceState = NULL;
--- canu.orig/src/main.mk
+++ canu/src/main.mk
@@ -101,24 +101,6 @@
gfa/bed.C
-ifeq (${BUILDSTACKTRACE}, 1)
-SOURCES += utility/src/utility/libbacktrace/atomic.c \
- utility/src/utility/libbacktrace/backtrace.c \
- utility/src/utility/libbacktrace/dwarf.c \
- utility/src/utility/libbacktrace/elf.c \
- utility/src/utility/libbacktrace/fileline.c \
- utility/src/utility/libbacktrace/mmap.c \
- utility/src/utility/libbacktrace/mmapio.c \
- utility/src/utility/libbacktrace/posix.c \
- utility/src/utility/libbacktrace/print.c \
- utility/src/utility/libbacktrace/simple.c \
- utility/src/utility/libbacktrace/sort.c \
- utility/src/utility/libbacktrace/state.c \
- utility/src/utility/libbacktrace/unknown.c
-endif
-
-
-
SRC_INCDIRS := . \
utility/src \
utility/src/utility \
|
