Fixes for FreeBSD build

Makefile

@@ -86,6 +86,7 @@ vagrant-freebsd-ci:
 	vagrant up freebsd11
 	vagrant rsync
 	vagrant ssh freebsd11 -c '\
+		export PATH=$$PATH:$$HOME/.local/bin && \
 		cd /vagrant && \
 		make full-ci \
 		'

src/dds.main.cpp

@@ -49,7 +49,7 @@ int main_fn(std::string_view program_name, const std::vector<std::string>& argv)
     auto result = boost::leaf::try_catch(
         [&]() -> std::optional<int> {
             parser.parse_argv(argv);
-            return {};
+            return std::nullopt;
         },
         [&](debate::help_request, debate::e_argument_parser p) {
             std::cout << p.parser.help_string(program_name);

tools/dds_ci/bootstrap.py

@@ -98,7 +98,7 @@ def _bootstrap_p6() -> Path:
     if ret_dds.exists():
         return ret_dds
 
-    _clone_self_at(p6_dir, '0.1.0-alpha.6')
+    _clone_self_at(p6_dir, '0.1.0-alpha.6-bootstrap')
     tc = 'msvc-rel.jsonc' if platform.system() == 'Windows' else 'gcc-9-rel.jsonc'
 
     catalog_arg = f'--catalog={p6_dir}/_catalog.db'
@@ -170,7 +170,7 @@ def _bootstrap_p5() -> Path:
     if ret_dds.exists():
         return ret_dds
 
-    _clone_self_at(p5_dir, 'bootstrap-p5')
+    _clone_self_at(p5_dir, 'bootstrap-p5.2')
     build_py = p5_dir / 'tools/build.py'
     proc.check_run(
         [
@@ -192,7 +192,7 @@ def _bootstrap_p4() -> Path:
     if ret_dds.exists():
         return ret_dds
 
-    _clone_self_at(p4_dir, 'bootstrap-p4')
+    _clone_self_at(p4_dir, 'bootstrap-p4.2')
     build_py = p4_dir / 'tools/build.py'
     proc.check_run(
         [
@@ -213,7 +213,7 @@ def _bootstrap_p1() -> Path:
     if ret_dds.exists():
         return ret_dds
 
-    _clone_self_at(p1_dir, 'bootstrap-p1')
+    _clone_self_at(p1_dir, 'bootstrap-p1.2')
     build_py = p1_dir / 'tools/build.py'
     proc.check_run([
         sys.executable,

tools/freebsd-gcc-10.jsonc

@@ -9,7 +9,9 @@
     ],
     "link_flags": [
         "-static-libgcc",
-        "-static-libstdc++"
+        "-static-libstdc++",
+        "-l:libssl.a",
+        "-l:libcrypto.a",
     ],
     "optimize": true
 }