Skip to content
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.

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

fix the linker error on ubuntu 24.04 #3559

Merged
merged 2 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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 3rd-party/libssh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ set(LIBSSH_INCLUDE_DIRS
set(LIB_INSTALL_DIR lib)
set(BIN_INSTALL_DIR bin)

set(BUILD_SHARED_LIBS ON)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

# space instead of empty string because empty string restults in non-defined GLOBAL_CLIENT_CONFIG in config.h
set(GLOBAL_CLIENT_CONFIG " ")
set(GLOBAL_BIND_CONFIG "/etc/ssh/libssh_server_config")
Expand Down
6 changes: 0 additions & 6 deletions tests/libvirt/test_libvirt_backend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ TEST_F(LibVirtBackend, libvirt_wrapper_missing_libvirt_throws)
EXPECT_THROW(mp::LibvirtWrapper{"missing_libvirt"}, mp::LibvirtOpenException);
}

TEST_F(LibVirtBackend, libvirt_wrapper_missing_symbol_throws)
{
// Need to set LD_LIBRARY_PATH to this .so for the multipass_tests executable
EXPECT_THROW(mp::LibvirtWrapper{"libbroken_libvirt.so"}, mp::LibvirtSymbolAddressException);
}

TEST_F(LibVirtBackend, health_check_good_does_not_throw)
{
EXPECT_CALL(*mock_backend, check_for_kvm_support()).WillOnce(Return());
Expand Down
Loading