Skip to content

Use version-script with cmake builds #776

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
val-ms merged 2 commits into from
Mar 23, 2023
Merged

Use version-script with cmake builds #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
745fbaf
Cmake: use symbol version-script
opoplawski Nov 19, 2022
271a618
Cmake: Additional symbol version-script fixes
val-ms Mar 19, 2023
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ __pycache__/

# C Linker output
*.ilk
*.map
*.exp

# C Precompiled Headers
Expand Down
3 changes: 3 additions & 0 deletions libclamav/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,9 @@ if(ENABLE_SHARED_LIB)
else()
target_link_libraries( clamav PUBLIC Iconv::Iconv )
endif()
if(UNIX AND NOT APPLE)
target_link_options( clamav PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libclamav.map")
endif()
if(WIN32)
install( TARGETS clamav DESTINATION . COMPONENT libraries )
install( FILES $<TARGET_PDB_FILE:clamav> DESTINATION . OPTIONAL COMPONENT libraries )
Expand Down
25 changes: 24 additions & 1 deletion libclamav/libclamav.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ CLAMAV_PUBLIC {
cl_engine_set_clcb_meta;
cl_engine_set_clcb_file_props;
cl_set_clcb_msg;
cl_engine_set_clcb_file_inspection;
cl_engine_set_clcb_pre_scan;
cl_engine_set_clcb_post_scan;
cl_engine_set_clcb_virus_found;
Expand Down Expand Up @@ -61,6 +60,17 @@ CLAMAV_PUBLIC {
cl_engine_stats_enable;
lsig_sub_matched;
};
CLAMAV_0.104.0 {
global:
cl_engine_set_clcb_engine_compile_progress;
cl_engine_set_clcb_engine_free_progress;
cl_engine_set_clcb_sigload_progress;
} CLAMAV_PUBLIC;
CLAMAV_1.0.0 {
global:
cl_cvdunpack;
cl_engine_set_clcb_file_inspection;
} CLAMAV_0.104.0;
CLAMAV_PRIVATE {
global:
cli_sigperf_print;
Expand Down Expand Up @@ -267,6 +277,19 @@ CLAMAV_PRIVATE {
cli_get_filepath_from_filedesc;
fmap_duplicate;
free_duplicate_fmap;
cli_add_content_match_pattern;
cli_dbgmsg;
cli_dbgmsg_no_inline;
cli_get_debug_flag;
cli_get_last_virus_str;
cli_getdsig;
cli_infomsg_simple;
cli_set_debug_flag;
fmap_dump_to_file;
init_allow_list;
init_domain_list;
lsig_increment_subsig_match;
readdb_parse_ldb_subsignature;

__cli_strcasestr;
__cli_strndup;
Expand Down
2 changes: 2 additions & 0 deletions libclamunrar/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ if(ENABLE_SHARED_LIB)

if(WIN32)
set_target_properties(clamunrar PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
elseif(UNIX AND NOT APPLE)
target_link_options(clamunrar PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libclamunrar.map")
endif()

if(WIN32)
Expand Down
2 changes: 2 additions & 0 deletions libclamunrar_iface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ if(ENABLE_UNRAR)

if(WIN32)
set_target_properties(clamunrar_iface PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
elseif(UNIX AND NOT APPLE)
target_link_options(clamunrar_iface PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libclamunrar_iface.map")
endif()

# Private (internal-only) dependencies.
Expand Down
2 changes: 2 additions & 0 deletions libfreshclam/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ if(ENABLE_SHARED_LIB)

if(WIN32)
set_target_properties(freshclam PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
elseif(UNIX AND NOT APPLE)
target_link_options(freshclam PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libfreshclam.map")
endif()
set_target_properties(freshclam PROPERTIES
COMPILE_FLAGS "${WARNCFLAGS}"
Expand Down
34 changes: 4 additions & 30 deletions unit_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,7 @@ if(ENABLE_APP)
target_link_libraries(check_fpu_endian
PRIVATE
ClamAV::libclamav
libcheck::check
tomsfastmath
JSONC::jsonc
${LIBMSPACK}
OpenSSL::SSL
OpenSSL::Crypto
ZLIB::ZLIB
BZip2::BZip2
PCRE2::pcre2
LibXml2::LibXml2)
libcheck::check)
if(ENABLE_SHARED_LIB)
target_link_libraries(check_fpu_endian
PRIVATE
Expand All @@ -84,16 +75,7 @@ if(ENABLE_APP)
PRIVATE
ClamAV::libclamav
ClamAV::common
libcheck::check
tomsfastmath
JSONC::jsonc
${LIBMSPACK}
OpenSSL::SSL
OpenSSL::Crypto
ZLIB::ZLIB
BZip2::BZip2
PCRE2::pcre2
LibXml2::LibXml2)
libcheck::check)
if(ENABLE_SHARED_LIB)
target_link_libraries(check_clamd
PRIVATE
Expand Down Expand Up @@ -132,16 +114,8 @@ target_sources(check_clamav
target_link_libraries(check_clamav
PRIVATE
ClamAV::libclamav
libcheck::check
tomsfastmath
JSONC::jsonc
${LIBMSPACK}
OpenSSL::SSL
OpenSSL::Crypto
ZLIB::ZLIB
BZip2::BZip2
PCRE2::pcre2
LibXml2::LibXml2)
ClamAV::common
libcheck::check)
if (ENABLE_UNRAR)
if(ENABLE_SHARED_LIB)
target_link_libraries(check_clamav
Expand Down