From 31d270824f2d0566b3db9d052c80f1bb25071484 Mon Sep 17 00:00:00 2001 From: dgsga <181612+dgsga@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:31:16 +0000 Subject: [PATCH] Fix Berkeley DB detection on omnios --- .github/workflows/meson.yml | 1 - meson.build | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml index b099596c38a2..e7360958da6e 100644 --- a/.github/workflows/meson.yml +++ b/.github/workflows/meson.yml @@ -239,7 +239,6 @@ jobs: run: | export PATH=/opt/local/sbin:/opt/local/bin:/usr/gnu/bin:/usr/bin:/usr/sbin:/sbin:$PATH meson setup build \ - -Dwith-bdb=/opt/local \ -Dpkg_config_path=/opt/local/lib/pkgconfig ninja -C build diff --git a/meson.build b/meson.build index 3c1155447b9c..7aab92dfa1b1 100644 --- a/meson.build +++ b/meson.build @@ -346,6 +346,7 @@ bdb_version = '' bdb_dirs = [ '/usr/local', '/usr/pkg', + '/opt/local', '/usr', ] bdb_subdirs = [