Skip to content

Commit 66c4c14

Browse files
timkpainealexddobkin
authored andcommitted
Build librdkafka with gssapi support for pip package, fixes #325
Signed-off-by: Tim Paine <[email protected]>
1 parent 6cca482 commit 66c4c14

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,14 +191,14 @@ endif
191191
.PHONY: dependencies-mac dependencies-debian dependencies-fedora dependencies-vcpkg dependencies-win
192192

193193
dependencies-mac: ## install dependencies for mac
194-
HOMEBREW_NO_AUTO_UPDATE=1 brew install bison cmake flex make ninja
194+
HOMEBREW_NO_AUTO_UPDATE=1 brew install autoconf autoconf-archive bison cmake flex libtool make ninja pkg-config
195195
brew unlink bison flex && brew link --force bison flex
196196

197197
dependencies-debian: ## install dependencies for linux
198-
apt-get install -y automake bison cmake curl flex ninja-build tar unzip zip
198+
apt-get install -y autoconf autoconf-archive automake bison cmake curl flex libtool ninja-build pkg-config tar unzip zip
199199

200200
dependencies-fedora: ## install dependencies for linux
201-
yum install -y automake bison ccache cmake curl flex perl-IPC-Cmd tar unzip zip
201+
yum install -y autoconf autoconf-archive automake bison ccache cmake curl flex libtool perl-IPC-Cmd pkg-config tar unzip zip
202202

203203
dependencies-vcpkg: ## install dependencies via vcpkg
204204
cd vcpkg && ./bootstrap-vcpkg.sh && ./vcpkg install

cpp/cmake/modules/FindDepsKafkaAdapter.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 3.7.2)
22

33
if (CSP_USE_VCPKG)
44
find_package(RdKafka CONFIG REQUIRED)
5+
if(NOT WIN32)
6+
# Bad, but a temporary workaround for
7+
# https://github.com/microsoft/vcpkg/issues/40320
8+
link_directories(${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib)
9+
endif()
510
else()
611
find_package(RdKafka REQUIRED)
712
endif()

cpp/csp/adapters/kafka/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set_target_properties(csp_kafka_adapter PROPERTIES PUBLIC_HEADER "${KAFKA_HEADER
2222

2323
find_package(DepsKafkaAdapter REQUIRED)
2424

25-
target_link_libraries(csp_kafka_adapter PRIVATE csp_adapter_utils RdKafka::rdkafka RdKafka::rdkafka++)
25+
target_link_libraries(csp_kafka_adapter PUBLIC csp_adapter_utils RdKafka::rdkafka RdKafka::rdkafka++)
2626

2727
install(TARGETS csp_kafka_adapter
2828
PUBLIC_HEADER DESTINATION include/csp/adapters/kafka

vcpkg

Submodule vcpkg updated 715 files

vcpkg.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,30 @@
77
"boost-beast",
88
"boost-multi-index",
99
"brotli",
10+
{
11+
"name": "cyrus-sasl",
12+
"platform": "!windows"
13+
},
1014
"exprtk",
1115
"gtest",
16+
{
17+
"name": "krb5",
18+
"platform": "!windows"
19+
},
1220
{
1321
"name": "librdkafka",
1422
"features": [
23+
{
24+
"name": "sasl",
25+
"platform": "!windows"
26+
},
1527
"ssl"
1628
]
1729
},
30+
{
31+
"name": "lmdb",
32+
"platform": "!windows"
33+
},
1834
"lz4",
1935
"openssl",
2036
"parquet",
@@ -30,5 +46,5 @@
3046
"port-version" : 1
3147
}
3248
],
33-
"builtin-baseline": "1b5f7346612cd63910567df714d867f5b3fa8e3b"
49+
"builtin-baseline": "6af584dd59aa5bdba75dae6781ec74614e03e5b9"
3450
}

0 commit comments

Comments
 (0)