From e680b0913aa39519b8b5200b8dd459b0315e0f2b Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 7 Jun 2024 03:50:31 +0000 Subject: [PATCH 1/2] meson.build: Allow undefined symbols on FreeBSD The linker cannot find environ while linking libutil. Fix build by allowing undefined symbols Change-Id: Iba319126284d48454b50db40d3aadf37e0339668 --- meson.build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meson.build b/meson.build index 7a6283ca2..5a772888d 100644 --- a/meson.build +++ b/meson.build @@ -167,6 +167,7 @@ message('canonical Nix system name:', host_system) is_linux = host_machine.system() == 'linux' is_darwin = host_machine.system() == 'darwin' +is_freebsd = host_machine.system() == 'freebsd' is_x64 = host_machine.cpu_family() == 'x86_64' # Per-platform arguments that you should probably pass to shared_module() invocations. @@ -462,6 +463,12 @@ if cxx.get_linker_id() in ['ld.bfd', 'ld.gold'] add_project_link_arguments('-Wl,--no-copy-dt-needed-entries', language : 'cpp') endif +if is_freebsd + # FreeBSD's `environ` is defined in `crt1.o`, not `libc.so`, + # so the linker thinks it's undefined + add_project_link_arguments('-Wl,-z,undefs', language: 'cpp') +endif + # Generate Chromium tracing files for each compiled file, which enables # maintainers/buildtime_report.sh BUILD-DIR to simply work in clang builds. # From f70b4258cdfd5d1d98e908dfc16fa15073d251ff Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 7 Jun 2024 03:40:07 +0000 Subject: [PATCH 2/2] libutil: Set boost defines for FreeBSD FreeBSD uses libunwind unwind.h, which does not require `_GNU_SOURCE` to expose `_Unwind_Backtrace`. Tell Boost that. Change-Id: I81e767967b1458118b86d212b5552d4d0a1200d9 --- src/libutil/fmt.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libutil/fmt.hh b/src/libutil/fmt.hh index df4492993..d015f7e5f 100644 --- a/src/libutil/fmt.hh +++ b/src/libutil/fmt.hh @@ -5,8 +5,8 @@ #include #include #include -// Darwin stdenv does not define _GNU_SOURCE but does have _Unwind_Backtrace. -#ifdef __APPLE__ +// Darwin and FreeBSD stdenv do not define _GNU_SOURCE but do have _Unwind_Backtrace. +#if __APPLE__ || __FreeBSD__ #define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED #endif #include