aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormyd7349 <myd7349@gmail.com>2019-06-14 08:04:44 +0800
committermyd7349 <myd7349@gmail.com>2019-06-14 08:04:44 +0800
commit3efdcef0e62aa6df7ff9088c001cff8d47304386 (patch)
tree8b912979da148c39d0dea5bea981441d0efde4b8
parent1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17 (diff)
downloadvcpkg-3efdcef0e62aa6df7ff9088c001cff8d47304386.tar.gz
vcpkg-3efdcef0e62aa6df7ff9088c001cff8d47304386.zip
[librdkafka] Update to 2019-06-13
-rw-r--r--ports/librdkafka/CONTROL5
-rw-r--r--ports/librdkafka/fix-arm64.patch21
-rw-r--r--ports/librdkafka/portfile.cmake6
3 files changed, 28 insertions, 4 deletions
diff --git a/ports/librdkafka/CONTROL b/ports/librdkafka/CONTROL
index dcc15f8ec..2c8346a12 100644
--- a/ports/librdkafka/CONTROL
+++ b/ports/librdkafka/CONTROL
@@ -1,6 +1,7 @@
Source: librdkafka
-Version: 2019-05-27
-Description: The Apache Kafka C/C++ library
+Version: 2019-06-13
+Description: The Apache Kafka C/C++ library
+Homepage: https://github.com/edenhill/librdkafka
Default-Features: ssl
Feature: lz4
diff --git a/ports/librdkafka/fix-arm64.patch b/ports/librdkafka/fix-arm64.patch
new file mode 100644
index 000000000..6a7750cec
--- /dev/null
+++ b/ports/librdkafka/fix-arm64.patch
@@ -0,0 +1,21 @@
+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 ef344b15f..1069aa234 100644
--- a/ports/librdkafka/portfile.cmake
+++ b/ports/librdkafka/portfile.cmake
@@ -3,9 +3,11 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO edenhill/librdkafka
- REF 0d525ba1252074732aac575f88f04831f2656b8f
- SHA512 f86d2a150b7c835b7de1a524d02a93ee3fcf4ff4f5f5b52fd49d6802bcb22f9829e562e8faef0842af7b4617aa49925622366f8290ada824be2602bf728dbdf0
+ REF b25436e6325e7c941eaed1d80a3ed65b6f404e47
+ SHA512 4de86fb14f932a67569cd79f924182559cb9bcc957635c36be493ec3233981755ff751982e48f6999fac50acb153f5c28a23e30538af1a2ad69af87be606a81f
HEAD_REF master
+ PATCHES
+ fix-arm64.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC)