Skip to content

fix parallel build for statically built librdkafka #70

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

Merged
merged 1 commit into from
Feb 19, 2022
Merged

fix parallel build for statically built librdkafka #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion .github/workflows/fast_testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ jobs:
run: pip3 install -r tests/requirements.txt

- name: Build module
run: tarantoolctl rocks STATIC_BUILD=ON make
run: |
export MAKEFLAGS=-j8
tarantoolctl rocks STATIC_BUILD=ON make

- name: Run tarantool application
run: TT_LOG=tarantool.log tarantool tests/app.lua > output.log 2>&1 &
Expand Down
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ set(MY_C_FLAGS "-Wall -Wextra -Werror -std=gnu11 -fno-strict-aliasing -Wno-depre
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${MY_C_FLAGS} -ggdb3")

set(Tarantool_FIND_REQUIRED ON)
find_package(Tarantool)
find_package(Tarantool REQUIRED)
# Oracle Connector requires fiber_cond API added in 1.7.4-291
string(REPLACE "-" "." tntver ${TARANTOOL_VERSION})
if(${tntver} VERSION_LESS 1.7.4.291)
Expand Down Expand Up @@ -42,9 +41,12 @@ if(STATIC_BUILD)
DEPENDS ${CMAKE_BINARY_DIR}/librdkafka/lib/librdkafka.a
)

add_library(librdkafka_static INTERFACE)
target_include_directories(librdkafka_static INTERFACE ${CMAKE_BINARY_DIR}/librdkafka/include)
target_link_libraries(librdkafka_static INTERFACE ${CMAKE_BINARY_DIR}/librdkafka/lib/librdkafka.a)
add_dependencies(librdkafka_static librdkafka.a)

set(RDKAFKA_LIBRARY ${RDKAFKA_LIBRARY} ${CMAKE_BINARY_DIR}/librdkafka/lib/librdkafka.a)
set(RDKAFKA_INCLUDE_DIR ${CMAKE_BINARY_DIR}/librdkafka/include)
set(RDKAFKA_LIBRARY ${RDKAFKA_LIBRARY} librdkafka_static)
else()
set(RDKAFKA_FIND_REQUIRED ON)
find_package(RdKafka)
Expand Down