From 9de5dffb5c97eb93545ae25eaf87ec195a590148 Mon Sep 17 00:00:00 2001
From: Andrew Onyshchuk <andryk.rv@gmail.com>
Date: Tue, 4 Feb 2020 16:12:24 -0600
Subject: [PATCH] Upgrade librdkafka to v1.3.0

Allow bundled librdkafka on Mac
---
 cmake/find/rdkafka.cmake                | 4 ++--
 contrib/librdkafka                      | 2 +-
 contrib/librdkafka-cmake/CMakeLists.txt | 2 ++
 contrib/librdkafka-cmake/config.h       | 9 +++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/cmake/find/rdkafka.cmake b/cmake/find/rdkafka.cmake
index 491f50b00b..dfab142a3c 100644
--- a/cmake/find/rdkafka.cmake
+++ b/cmake/find/rdkafka.cmake
@@ -1,5 +1,5 @@
 # Freebsd: contrib/cppkafka/include/cppkafka/detail/endianness.h:53:23: error: 'betoh16' was not declared in this scope
-if (NOT ARCH_ARM AND NOT ARCH_32 AND NOT APPLE AND NOT OS_FREEBSD AND OPENSSL_FOUND)
+if (NOT ARCH_ARM AND NOT ARCH_32 AND NOT OS_FREEBSD AND OPENSSL_FOUND)
     option (ENABLE_RDKAFKA "Enable kafka" ${ENABLE_LIBRARIES})
 endif ()
 
@@ -10,7 +10,7 @@ endif ()
 
 if (ENABLE_RDKAFKA)
 
-if (OS_LINUX AND NOT ARCH_ARM AND USE_LIBGSASL)
+if (NOT ARCH_ARM AND USE_LIBGSASL)
     option (USE_INTERNAL_RDKAFKA_LIBRARY "Set to FALSE to use system librdkafka instead of the bundled" ${NOT_UNBUNDLED})
 endif ()
 
diff --git a/contrib/librdkafka b/contrib/librdkafka
index 6160ec275a..4ffe54b4f5 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit 6160ec275a5bb0a4088ede3c5f2afde638bbef65
+Subproject commit 4ffe54b4f59ee5ae3767f9f25dc14651a3384d62
diff --git a/contrib/librdkafka-cmake/CMakeLists.txt b/contrib/librdkafka-cmake/CMakeLists.txt
index fc1ba23f7c..0f7b8e349f 100644
--- a/contrib/librdkafka-cmake/CMakeLists.txt
+++ b/contrib/librdkafka-cmake/CMakeLists.txt
@@ -23,6 +23,8 @@ set(SRCS
   ${RDKAFKA_SOURCE_DIR}/rdkafka_lz4.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata_cache.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_mock.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_mock_handlers.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_msg.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_reader.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_writer.c
diff --git a/contrib/librdkafka-cmake/config.h b/contrib/librdkafka-cmake/config.h
index 78b9bc613c..dae2c7424e 100644
--- a/contrib/librdkafka-cmake/config.h
+++ b/contrib/librdkafka-cmake/config.h
@@ -75,8 +75,17 @@
 #define HAVE_STRNDUP 1
 // strerror_r
 #define HAVE_STRERROR_R 1
+
+#ifdef __APPLE__
+#define HAVE_PTHREAD_SETNAME_DARWIN 1
+#if (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ <= 101400)
+#define _TTHREAD_EMULATE_TIMESPEC_GET_
+#endif
+
+#else
 // pthread_setname_gnu
 #define HAVE_PTHREAD_SETNAME_GNU 1
+#endif
 // python
 //#define HAVE_PYTHON 1
 // disable C11 threads for compatibility with old libc