Clean up some FreeBSD conditions (#98)

* Depend on host_machine not build_machine
latchset · Feb 2, 2024 · 5a81837 · 5a81837
1 parent e6a7ae7
commit 5a81837
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -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

diff --git a/meson.build b/meson.build
@@ -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
 
@@ -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,
 )

diff --git a/tests/issue-75/meson.build b/tests/issue-75/meson.build
@@ -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])