portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

haiku and dragonflybsd build fixes. (#1767)

Browse source
This commit is contained in:
David CARLIER 2021-09-28 20:54:49 +01:00 committed by GitHub
parent 178701f721
commit 1bdb6d13a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
librz/util/meson.build
View file

@ -84,7 +84,7 @@ rz_util_sources = [
]
rz_util_deps = [ldl, lrt, mth, pth, utl, sdb_dep, zlib_dep, platform_deps]
if host_machine.system().startswith('freebsd') or host_machine.system().startswith('netbsd') or host_machine.system().startswith('haiku')
if ['freebsd', 'netbsd', 'haiku', 'dragonfly'].contains(host_machine.system())
# backtrace_symbols_fd requires -lexecinfo
rz_util_deps += [cc.find_library('execinfo', static: is_static_build)]
endif

4
meson.build
View file

@ -338,7 +338,7 @@ userconf.set10('HAVE_DECL_ADDR_NO_RANDOMIZE', ok)
ok = cc.has_header_symbol('sys/procctl.h', 'PROC_ASLR_CTL')
userconf.set10('HAVE_DECL_PROCCTL_ASLR_CTL', ok)
if host_machine.system() == 'freebsd'
if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonfly'
add_project_link_arguments('-Wl,--unresolved-symbols,ignore-in-object-files', language: 'c')
add_project_link_arguments('-Wl,--allow-shlib-undefined', language: 'c')
endif
@ -348,7 +348,7 @@ if not cc.has_function('clock_gettime', prefix: '#include <time.h>') and cc.has_
lrt = cc.find_library('rt', required: true, static: is_static_build)
endif
have_lrt = not ['windows', 'darwin', 'openbsd', 'android'].contains(host_machine.system())
have_lrt = not ['windows', 'darwin', 'openbsd', 'android', 'haiku'].contains(host_machine.system())
if have_lrt and lrt == []
lrt = cc.find_library('rt', required: true, static: is_static_build)
endif