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

[librdkafka] Upgrade up to 1.7 #17937

Merged
merged 19 commits into from
May 18, 2021
Merged

[librdkafka] Upgrade up to 1.7 #17937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9fb1146
Add files via upload
alexander-smyslov Apr 9, 2019
4334b76
Merge pull request #2 from alexander-smyslov/activemq-cpp
alexander-smyslov Apr 9, 2019
4be34cc
[new port] avro-cpp
Oct 14, 2019
850eaf7
Merge pull request #3 from alexander-smyslov/avro-cpp
alexander-smyslov Oct 14, 2019
2531600
merge with master
Oct 14, 2019
f2c7dff
add boost-format
Oct 14, 2019
c920c1a
remove comments
Oct 15, 2019
4848f63
remove comments
Oct 15, 2019
106c69f
Merge branch 'master' of https://github.com/microsoft/vcpkg
May 15, 2020
374f28f
Merge remote-tracking branch 'upstream/master'
May 19, 2020
e94eca7
Merge remote-tracking branch 'upstream/master'
May 21, 2020
b930e15
Merge remote-tracking branch 'upstream/master'
Jun 11, 2020
2f5a0d6
Merge remote-tracking branch 'upstream/master'
Jun 24, 2020
6d876f5
merge from upstream
Sep 18, 2020
013a92d
Merge remote-tracking branch 'upstream/master'
May 14, 2021
21d23f9
Upgrade librdkafka17
May 14, 2021
43713e0
Upgrade librdkafka17
May 14, 2021
01f353d
Fix remarks
May 15, 2021
d14b57c
Fix remarks
May 15, 2021
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
2 changes: 1 addition & 1 deletion ports/librdkafka/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: librdkafka
Version: 1.5.0
Version: 1.7.0
Description: The Apache Kafka C/C++ library
Homepage: https://github.com/edenhill/librdkafka

Expand Down
21 changes: 0 additions & 21 deletions ports/librdkafka/fix-arm64.patch
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions ports/librdkafka/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO edenhill/librdkafka
REF 39796d359898c07ea422849e6d7cd34cd13ec466 #v1.5.0
SHA512 96bc1e1063d4387483f955315a8523045a308aba5fc40197c805f14ceb12ff5241f98b6937c41ab84094fe39e034e8b11ba66dd4d69a758b6ecb20d56d78cbfe
REF 77a013b7a2611f7bdc091afa1e56b1a46d1c52f5 #v1.7.0
SHA512 3eedfe2dcca90a392b82aa512989cdf5ecde2c7c9779aecdd619375da4e04071fdc868ce37c01948346cfa48cd6f7395cbc074edd6e36c678193791ffe7a9ed1
HEAD_REF master
PATCHES
fix-arm64.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
lz4 ENABLE_LZ4_EXT
ssl WITH_SSL
zlib WITH_ZLIB
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3449,7 +3449,7 @@
"port-version": 0
},
"librdkafka": {
"baseline": "1.5.0",
"baseline": "1.7.0",
"port-version": 0
},
"libressl": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/librdkafka.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d436f6df2863c1bf133c1f0efd53cb8281710b80",
"version-string": "1.7.0",
"port-version": 0
},
{
"git-tree": "6cdfbfb527ed75e097d74d502fe2dcaea147d5f0",
"version-string": "1.5.0",
Expand Down