From 4ee0a5a7f59651c32ba090f88586021fe34796b3 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Wed, 29 Dec 2021 00:18:52 +0000 Subject: [PATCH 1/2] The start of supporting freebsd as a target Signed-off-by: Jesse Szwedko --- Cargo.toml | 1 + Cross.toml | 3 +++ scripts/cross/x86_64-unknown-freebsd.dockerfile | 6 ++++++ 3 files changed, 10 insertions(+) create mode 100644 scripts/cross/x86_64-unknown-freebsd.dockerfile diff --git a/Cargo.toml b/Cargo.toml index 497d919e90c43..f51ed141b39e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -376,6 +376,7 @@ target-x86_64-unknown-linux-musl = ["api", "api-client", "rdkafka-cmake", "enric target-powerpc64le-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka-cmake", "sinks", "sources", "sources-dnstap", "transforms", "unix", "vendor-libz", "vendor-openssl", "vrl-cli", "datadog-pipelines"] # currently doesn't build due to lack of support for 64-bit atomics target-powerpc-unknown-linux-gnu = ["api", "api-client", "enrichment-tables", "rdkafka-cmake", "sinks", "sources", "sources-dnstap", "transforms", "unix", "vendor-libz", "vendor-openssl", "vrl-cli", "datadog-pipelines"] +target-x86_64-unknown-freebsd = [] # Enables `rdkafka` dependency. # This feature is more portable, but requires `cmake` as build dependency. Use it if `rdkafka-plain` doesn't work. diff --git a/Cross.toml b/Cross.toml index 1393e33b38267..d5e156140cef6 100644 --- a/Cross.toml +++ b/Cross.toml @@ -25,3 +25,6 @@ image = "vector-cross-env:armv7-unknown-linux-gnueabihf" [target.armv7-unknown-linux-musleabihf] image = "vector-cross-env:armv7-unknown-linux-musleabihf" + +[target.x86_64-unknown-freebsd] +image = "vector-cross-env:x86_64-unknown-freebsd" diff --git a/scripts/cross/x86_64-unknown-freebsd.dockerfile b/scripts/cross/x86_64-unknown-freebsd.dockerfile new file mode 100644 index 0000000000000..d646f5f39368d --- /dev/null +++ b/scripts/cross/x86_64-unknown-freebsd.dockerfile @@ -0,0 +1,6 @@ +FROM docker.io/rustembedded/cross:x86_64-unknown-freebsd + +# freebsd image is actually based on Ubuntu and copies over FreeBSD libraries + +COPY bootstrap-ubuntu.sh . +RUN ./bootstrap-ubuntu.sh From 752f33444d16c88279eafa6976ff055627cee587 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Mon, 27 Jun 2022 17:42:07 +0000 Subject: [PATCH 2/2] Update dockerfile FROM Signed-off-by: Jesse Szwedko --- scripts/cross/x86_64-unknown-freebsd.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cross/x86_64-unknown-freebsd.dockerfile b/scripts/cross/x86_64-unknown-freebsd.dockerfile index d646f5f39368d..79129d3973dfc 100644 --- a/scripts/cross/x86_64-unknown-freebsd.dockerfile +++ b/scripts/cross/x86_64-unknown-freebsd.dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/rustembedded/cross:x86_64-unknown-freebsd +FROM ghcr.io/cross-rs/x86_64-unknown-freebsd:main # freebsd image is actually based on Ubuntu and copies over FreeBSD libraries