Skip to content

Commit

Permalink
Clean up some FreeBSD conditions (#98)
Browse files Browse the repository at this point in the history
* Depend on host_machine not build_machine
  • Loading branch information
hdholm authored Feb 2, 2024
1 parent e6a7ae7 commit 5a81837
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ You can even run the tests if you'd like:
To build a FreeBSD, HardenedBSD or OPNsense package
use:

(as root) # pkg install meson pkgconf jansson openssl jq
(as root) # pkg install meson pkgconf jansson openssl asciidoc jq

$ mkdir build && cd build
$ meson setup .. --prefix=/usr/local
$ ninja
Expand Down
5 changes: 2 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ project('jose', 'c', license: 'APL2',
)

licensedir = join_paths(get_option('prefix'), 'share', 'licenses', meson.project_name())
if build_machine.system() == 'freebsd'
if host_machine.system() == 'freebsd'
licensedir += '-'+meson.project_version()
endif

Expand Down Expand Up @@ -59,8 +59,7 @@ pkg.generate(
version: meson.project_version(),
filebase: meson.project_name(),
name: 'José Library',

requires_private: [ 'zlib', 'libcrypto' ],
libraries_private: [ zlib, libcrypto ],
libraries: libjose_lib,
requires: jansson,
)
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-75/meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
e = environment()

openssl = dependency('openssl', required: false)
openssl = dependency('openssl', version: '>= 1.1.0', required: false)
if openssl.found()
issue75 = executable('issue75', 'issue-75.c',
dependencies: [libjose_dep, openssl])
Expand Down

0 comments on commit 5a81837

Please sign in to comment.