Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Get rdkafka to build on windows #811

Merged
merged 3 commits into from
Oct 16, 2020
Merged

fix: Get rdkafka to build on windows #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8aa2cdc
fix: Get rdkafka to build on windows
Swatinem Oct 15, 2020
0b7aaae
install cmake in the deps image
Swatinem Oct 15, 2020
d200630
add CMake dependency to README
Swatinem Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ENV OPENSSL_STATIC=1

RUN apt-get update \
&& apt-get install --no-install-recommends -y \
curl build-essential git zip \
curl build-essential git zip cmake \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ for more information.
To build Relay, we require the **latest stable Rust**. The crate is split into a
workspace with multiple features, so when running building or running tests
always make sure to pass the `--all` and `--all-features` flags.
The `processing` feature additionally requires a C compiler and CMake.

We use VSCode for development. This repository contains settings files
configuring code style, linters, and useful features. When opening the project
Expand Down
5 changes: 3 additions & 2 deletions relay-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ processing = [
"minidump",
"rdkafka",
"rdkafka-sys",
"rdkafka-sys/cmake-build",
"relay-config/processing",
"relay-quotas/redis",
"relay-redis/impl",
Expand All @@ -41,8 +42,8 @@ log = "0.4.8"
minidump = { git = "https://github.com/luser/rust-minidump", rev = "f8a18211dbb0bf7dca5dd41e578af4b366fcb9be", optional = true }
native-tls = { version = "0.2.4", optional = true }
parking_lot = "0.10.0"
rdkafka = { version = "0.23.1", optional = true }
rdkafka-sys = { version = "~1.3.1", optional = true }
rdkafka = { version = "0.24", optional = true }
rdkafka-sys = { version = "2.1.0", optional = true }
regex = "1.3.9"
relay-auth = { path = "../relay-auth" }
relay-common = { path = "../relay-common" }
Expand Down