diff options
| author | Alexander Smyslov <37107500+alexander-smyslov@users.noreply.github.com> | 2021-05-18 09:45:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 00:45:48 -0700 |
| commit | b8d922991f04efb41ded1b578308a48cdec90ff2 (patch) | |
| tree | 44b460de510a06d6acbcd664e1b5285035de96fe | |
| parent | faf52ad89f03e50fa756d9e24455c966f7756815 (diff) | |
| download | vcpkg-b8d922991f04efb41ded1b578308a48cdec90ff2.tar.gz vcpkg-b8d922991f04efb41ded1b578308a48cdec90ff2.zip | |
[librdkafka] Upgrade up to 1.7 (#17937)
* Add files via upload
* [new port] avro-cpp
* add boost-format
* remove comments
* remove comments
* Upgrade librdkafka17
* Upgrade librdkafka17
* Fix remarks
* Fix remarks
Co-authored-by: Alexander Smyslov <aleksandr.smyslov@libertexgroup.com>
Co-authored-by: Smyslov Alexander Nikolayevich <aleksandr.smyslov@fxclub.com>
| -rw-r--r-- | ports/librdkafka/CONTROL | 2 | ||||
| -rw-r--r-- | ports/librdkafka/fix-arm64.patch | 21 | ||||
| -rw-r--r-- | ports/librdkafka/portfile.cmake | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/librdkafka.json | 5 |
5 files changed, 10 insertions, 27 deletions
diff --git a/ports/librdkafka/CONTROL b/ports/librdkafka/CONTROL index 12f1ae21b..20d9a8606 100644 --- a/ports/librdkafka/CONTROL +++ b/ports/librdkafka/CONTROL @@ -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
diff --git a/ports/librdkafka/fix-arm64.patch b/ports/librdkafka/fix-arm64.patch deleted file mode 100644 index 6a7750cec..000000000 --- a/ports/librdkafka/fix-arm64.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/snappy_compat.h b/src/snappy_compat.h -index acda21ec..bf2fe4c7 100644 ---- a/src/snappy_compat.h -+++ b/src/snappy_compat.h -@@ -89,7 +89,7 @@ struct iovec { - // x86, PowerPC, and ARM64 can simply do these loads and stores native. - #if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || \ - defined(_M_IX86) || defined(_M_X64) || defined(_M_AMD64) || \ -- defined(__aarch64__) -+ defined(__arm64) || defined(__aarch64__) || defined(__AARCH64EL__) || defined(_M_ARM64) - - #define get_unaligned get_unaligned_direct - #define put_unaligned put_unaligned_direct -@@ -115,6 +115,7 @@ struct iovec { - !defined(__ARM_ARCH_6J__) && \ - !defined(__ARM_ARCH_6K__) && \ - !defined(__ARM_ARCH_6Z__) && \ -+ !defined(__ARM_ARCH_6KZ__) && \ - !defined(__ARM_ARCH_6ZK__) && \ - !defined(__ARM_ARCH_6T2__) - diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index 5ae2b695e..9b2d48255 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -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
diff --git a/versions/baseline.json b/versions/baseline.json index 90d9fed11..f1aec8482 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3449,7 +3449,7 @@ "port-version": 0 }, "librdkafka": { - "baseline": "1.5.0", + "baseline": "1.7.0", "port-version": 0 }, "libressl": { diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index 75a9623f5..25a8e064f 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "d436f6df2863c1bf133c1f0efd53cb8281710b80", + "version-string": "1.7.0", + "port-version": 0 + }, + { "git-tree": "6cdfbfb527ed75e097d74d502fe2dcaea147d5f0", "version-string": "1.5.0", "port-version": 0 |