Skip to content

Commit

Permalink
Try to speed up Omnios VM
Browse files Browse the repository at this point in the history
  • Loading branch information
dgsga committed Mar 2, 2024
1 parent fb3a8fe commit b640b90
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,26 +221,22 @@ jobs:
with:
copyback: false
prepare: |
pkg set-publisher -m https://us-west.mirror.omnios.org/r151048/core/ omnios
pkg set-publisher -m https://us-west.mirror.omnios.org/r151048/extra/ extra.omnios
pkg install \
build-essential \
pkg-config
curl -O https://pkgsrc.smartos.org/packages/SmartOS/bootstrap/bootstrap-trunk-x86_64-20240116.tar.gz
tar -zxpf bootstrap-trunk-x86_64-20240116.tar.gz -C /
export PATH=/opt/local/sbin:/opt/local/bin:/usr/gnu/bin:/usr/bin:/usr/sbin:/sbin:$PATH
pkgin -y install \
avahi \
gcc13 \
gnome-tracker \
libevent \
libgcrypt \
meson \
pkg-config \
talloc
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 \
-Dwith-libgcrypt-dir=/opt/local \
-Dwith-tracker-pkgconfig-version=3.0 \
-Dpkg_config_path=/opt/local/lib/pkgconfig
ninja -C build
Expand Down
11 changes: 11 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@ elif host_os == 'netbsd'
'etc/afpd',
'/usr/pkg/include',
)
elif host_os == 'omnios'
root_includes = include_directories(
'.',
'include',
'etc/afpd',
'/opt/local/include',
)
else
root_includes = include_directories(
'.',
Expand All @@ -138,6 +145,10 @@ if host_os == 'netbsd'
libsearch_dirs += '/usr/pkg/lib'
endif

if host_os == 'omnios'
libsearch_dirs += '/opt/local/lib'
endif

socket = cc.find_library('socket', required: false)
if socket.found()
netatalk_common_link_args += '-lsocket'
Expand Down

0 comments on commit b640b90

Please sign in to comment.