shift to a single package for selecting cross-target

packages/conf-zig-cross/conf-zig-cross.aarch64-al2023/opam

@@ -0,0 +1,8 @@
+opam-version: "2.0"
+maintainer: "hello@chrisarmstrong.dev"
+build: [
+  ["sh" "-c" "echo 'ocaml_triple: \"aarch64-linux-gnu\"' >> conf-zig-cross.config"]
+  ["sh" "-c" "echo 'zig_triple: \"aarch64-linux-gnu.2.34\"' >> conf-zig-cross.config"]
+]
+synopsis:
+  "Configuration package to target ARM64 Amazon Linux from zig-cross"

packages/conf-zig-cross/conf-zig-cross.rpi/opam

@@ -0,0 +1,8 @@
+opam-version: "2.0"
+maintainer: "hello@chrisarmstrong.dev"
+build: [
+  ["sh" "-c" "echo 'ocaml_triple: \"aarch64-linux-gnu\"' >> conf-zig-cross.config"]
+  ["sh" "-c" "echo 'zig_triple: \"aarch64-linux-gnu -mcpu=generic\"' >> conf-zig-cross.config"]
+]
+synopsis:
+  "Configuration package to target the Raspberry Pi from zig-cross"

packages/conf-zig-cross/conf-zig-cross.x86_64-al2023/opam

@@ -0,0 +1,8 @@
+opam-version: "2.0"
+maintainer: "hello@chrisarmstrong.dev"
+build: [
+  ["sh" "-c" "echo 'ocaml_triple: \"x86_64-linux-gnu\"' >> conf-zig-cross.config"]
+  ["sh" "-c" "echo 'zig_triple: \"x86_64-linux-gnu.2.34\"' >> conf-zig-cross.config"]
+]
+synopsis:
+  "Configuration package to target x86_64 Amazon Linux from zig-cross"

packages/conf-zig-wrapper-cross-x86_64-al2023/conf-zig-wrapper-cross-x86_64-al2023.0/files/install.sh → packages/conf-zig-wrapper/conf-zig-wrapper.0/files/install.sh

@@ -67,6 +67,10 @@ zig_cc_wrapper="${PREFIX}/bin/$CROSS_NAME-target-cc"
 make_wrapper "$zig_cc_wrapper" "${ZIG} cc -target ${HOST_TARGET}"
 make_windows_cmd_wrapper "$zig_cc_wrapper"
 
+zig_cxx_wrapper="${PREFIX}/bin/$CROSS_NAME-target-c++"
+make_wrapper "$zig_cxx_wrapper" "${ZIG} c++ -target ${HOST_TARGET}"
+make_windows_cmd_wrapper "$zig_cxx_wrapper"
+
 zig_aspp_wrapper="${PREFIX}/bin/$CROSS_NAME-target-aspp"
 make_wrapper "$zig_aspp_wrapper" "${ZIG} cc -target ${HOST_TARGET} -c"
 make_windows_cmd_wrapper "$zig_aspp_wrapper"

packages/conf-zig-wrapper/conf-zig-wrapper.0/opam

@@ -0,0 +1,11 @@
+opam-version: "2.0"
+maintainer: "hello@chrisarmstrong.dev"
+install: [
+  ["bash" "install.sh" "%{prefix}%" "zig-cross" "%{conf-zig-cross:zig_triple}%"]
+]
+extra-files: [
+  [ "install.sh" "sha256=73690c04b4779d2ec7bae905eb8d18da21bef48b765056fa892801416582473f" ]
+]
+depends: [ "conf-zig" "conf-zig-cross" ]
+synopsis:
+  "Virtual package specifying ocaml-cross zig wrapper utilities configuration"