build+ci: support CentOS Stream 9 and macOS/arm64
This commit also syncs the CI config and scripts with ndn-tools
Change-Id: I58246dac18b262d23404d12292988ef34d49525a
diff --git a/wscript b/wscript
index ddae792..5aa05c9 100644
--- a/wscript
+++ b/wscript
@@ -25,7 +25,12 @@
conf.env.WITH_TESTS = conf.options.with_tests
- conf.find_program('dot', var='DOT', mandatory=False)
+ conf.find_program('dot', mandatory=False)
+
+ # Prefer pkgconf if it's installed, because it gives more correct results
+ # on Fedora/CentOS/RHEL/etc. See https://bugzilla.redhat.com/show_bug.cgi?id=1953348
+ # Store the result in env.PKGCONFIG, which is the variable used inside check_cfg()
+ conf.find_program(['pkgconf', 'pkg-config'], var='PKGCONFIG')
pkg_config_path = os.environ.get('PKG_CONFIG_PATH', f'{conf.env.LIBDIR}/pkgconfig')
conf.check_cfg(package='libndn-cxx', args=['libndn-cxx >= 0.8.0', '--cflags', '--libs'],
@@ -36,6 +41,7 @@
boost_libs = ['system', 'program_options', 'filesystem']
if conf.env.WITH_TESTS:
boost_libs.append('unit_test_framework')
+
conf.check_boost(lib=boost_libs, mt=True)
conf.check_compiler_flags()