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
|
Author: Andreas Tille <tille@debian.org>
Last-Update: 2020-01-16
Bug-Debian: https://bugs.debian.org/948926
Description: Add some missing libraries to linker
--- a/meson.build
+++ b/meson.build
@@ -51,10 +51,10 @@ blasr_thread_dep = dependency('threads',
blasr_boost_dep = dependency('boost', include_type : 'system', required : true)
# pbbam
-blasr_pbbam_dep = dependency('pbbam', fallback : ['pbbam', 'pbbam_dep'])
+blasr_pbbam_dep = cpp.find_library('pbbam')
# libblasr
-blasr_libblasr_dep = dependency('libblasr', fallback : ['blasr_libcpp', 'libblasr_dep'])
+blasr_libblasr_dep = dependency('libblasr', required : true)
# zlib
blasr_zlib_dep = dependency('zlib', required : true, fallback : ['zlib', 'zlib_dep'])
@@ -62,11 +62,15 @@ blasr_zlib_dep = dependency('zlib', requ
# htslib
blasr_htslib_dep = dependency('htslib', required : true, version : '>=1.4', fallback : ['htslib', 'htslib_dep'])
+# missing libs for linker
+blasr_pbcopper_deps = cpp.find_library('pbcopper')
+
blasr_deps = [
blasr_thread_dep,
blasr_boost_dep,
blasr_pbbam_dep,
blasr_libblasr_dep,
+ blasr_pbcopper_deps,
blasr_zlib_dep,
blasr_htslib_dep]
@@ -110,7 +114,7 @@ blasr_static_impl = static_library(
blasr_sources,
install : false,
dependencies : blasr_deps,
- cpp_args : [blasr_warning_flags, '-DUSE_PBBAM=1'])
+ cpp_args : [blasr_warning_flags])
blasr_main = executable(
'blasr', [
@@ -120,7 +124,7 @@ blasr_main = executable(
install : true,
dependencies : blasr_deps,
link_with : blasr_static_impl,
- cpp_args : [blasr_warning_flags, '-DUSE_PBBAM=1', '-DCMAKE_BUILD=1'])
+ cpp_args : [blasr_warning_flags, '-DCMAKE_BUILD=1'])
blasr_utils_sawriter = executable(
'sawriter', files([
@@ -128,7 +132,7 @@ blasr_utils_sawriter = executable(
install : true,
dependencies : blasr_deps,
link_with : blasr_static_impl,
- cpp_args : [blasr_warning_flags, '-DUSE_PBBAM=1', '-DCMAKE_BUILD=1'])
+ cpp_args : [blasr_warning_flags, '-DCMAKE_BUILD=1'])
blasr_utils_toAfg = executable(
'toAfg', files([
@@ -136,7 +140,7 @@ blasr_utils_toAfg = executable(
install : false,
dependencies : blasr_deps,
link_with : blasr_static_impl,
- cpp_args : [blasr_warning_flags, '-DUSE_PBBAM=1', '-DCMAKE_BUILD=1'])
+ cpp_args : [blasr_warning_flags, '-DCMAKE_BUILD=1'])
#########
# tests #
|
