Skip to content

Commit 8728208

Browse files
committed
Removed lots of debug message() commands
that were just for debugging meson.build. modified: src/lib/libdwarf/meson.build
1 parent f4219c3 commit 8728208

File tree

1 file changed

+4
-48
lines changed

1 file changed

+4
-48
lines changed

src/lib/libdwarf/meson.build

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -65,102 +65,58 @@ if dev_decompression
6565
zlib_deps = dependency('zlib', method: 'pkg-config', required: false)
6666
libzstd_deps = dependency('libzstd', method: 'pkg-config', required: false)
6767

68-
if zlib_deps.found()
69-
message(['mesondebug found base zlib',zlib_deps.found()])
70-
endif
71-
if libzstd_deps.found()
72-
message(['mesondebug found base libzstd',libzstd_deps.found()])
73-
endif
74-
75-
if zlib_deps.found()
76-
message(['mesondebug found base zlib',zlib_deps.found()])
77-
else
68+
if not zlib_deps.found()
7869
if fs.is_dir('/opt/local/lib') and fs.is_file('/opt/local/include/zlib.h')
79-
message(['mesondebug /opt/local/include/zlib.h exists'])
8070
zlib_deps = declare_dependency(link_args: [ '-L/opt/local/lib','-lz' ],
8171
include_directories: ['/opt/local/include'])
82-
message(['mesondebug zlib in /opt/local',zlib_deps.found()])
8372
endif
84-
endif
73+
endif
8574

86-
if libzstd_deps.found()
87-
message(['mesondebug found base libzstd',libzstd_deps.found()])
88-
else
75+
if not libzstd_deps.found()
8976
if fs.is_dir('/opt/local/lib') and fs.is_file('/opt/local/include/zstd.h')
90-
message(['mesondebug /opt/local/include/zstd.h exists'])
9177
libzstd_deps = declare_dependency(link_args: ['-L/opt/local/lib','-lzstd' ],
9278
include_directories: ['/opt/local/include'])
93-
message(['mesondebug zstd in /opt/local', libzstd_deps.found()])
9479
endif
9580
endif
9681

9782
if zlib_deps.found()
9883
message(['Have zlib'])
9984
else
10085
if fs.is_dir('/usr/local/lib') and fs.is_file('/usr/local/include/zlib.h')
101-
message(['mesondebug /usr/local/include/zlib.h exists'])
10286
zlib_deps = declare_dependency(link_args: [ '-L/usr/local/lib','-lz' ],
10387
include_directories: ['/usr/local/include'])
104-
message(['mesondebug zlib in /usr/local',zlib_deps.found()])
10588
endif
10689
endif
10790

10891
if libzstd_deps.found()
10992
message(['Have libzstd'])
11093
else
11194
if fs.is_dir('/usr/local/lib') and fs.is_file('/usr/local/include/zstd.h')
112-
message(['mesondebug /usr/local/include/zstd.h exists'])
11395
libzstd_deps = declare_dependency(link_args: [ '-L/usr/local/lib',
11496
'-lzstd' ],
11597
include_directories: ['/usr/local/include'])
116-
message(['mesondebug zstd in /usr/local',libzstd_deps.found()])
117-
endif
98+
endif
11899
endif
119100

120101
# Using set10 as false has the wrong effect, does not
121102
# match what compilers expect from #ifdef in C.
122103
if zlib_deps.found()
123104
if libzstd_deps.found()
124-
message('mesondebug Have zlib and libzstd')
125105
config_h.set10('HAVE_ZSTD_H',true)
126106
config_h.set10('HAVE_ZSTD',true)
127107
config_h.set10('HAVE_ZLIB_H',true)
128108
config_h.set10('HAVE_ZLIB',true)
129109
else
130-
#config_h.set10('HAVE_ZLIB_H',false)
131-
#config_h.set10('HAVE_ZLIB',false)
132110
zlib_deps = dependency('',required: false)
133-
if zlib_deps.found()
134-
error('mesondebug libdwarf error zlib')
135-
endif
136-
message('mesondebug no libzstd, set zlib_deps', zlib_deps.found())
137-
message('mesondebug Since builds and tests both ')
138-
message('mesondebug leaving zlib set will be ignored in build and test')
139111
endif
140112
else
141113
if libzstd_deps.found()
142-
#config_h.set10('HAVE_ZSTD_H',false)
143-
#config_h.set10('HAVE_ZSTD',false)
144114
libszstd_deps = dependency('',required: false)
145-
if libzstd_deps.found()
146-
error('mesondebug libdwarf error libzstd')
147-
endif
148-
message('mesondebug no zlib, set libzstd_deps',libzstd_deps.found())
149-
message('mesondebug Since builds and tests want both')
150-
message('mesondebug leaving libzstd set will be ignored in build and test')
151-
else
152-
message('mesondebug found neither zlib nor libzstd')
153115
endif
154116
endif
155117
else
156118
zlib_deps = dependency('',required: false)
157119
libzstd_deps = dependency('',required: false)
158-
# Using set10 as false has the wrong effect, does not
159-
# match what compilers expect from #ifdef in C.
160-
#config_h.set10('HAVE_ZLIB_H',false)
161-
#config_h.set10('HAVE_ZLIB',false)
162-
#config_h.set10('HAVE_ZSTD_H',false)
163-
#config_h.set10('HAVE_ZSTD',false)
164120
endif
165121

166122
if (lib_type == 'shared')

0 commit comments

Comments
 (0)