diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2023-03-21 12:37:23 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2023-03-21 12:37:23 +0300 |
| commit | 8c039f0e189dfefc2f05e4f76c97ac5f804bb1f6 (patch) | |
| tree | 4d124c9c4abad36bc898a383fb672d49d12aec79 /contrib | |
| parent | f1303b6e66a6625241ad019ab59ef31611014c38 (diff) | |
| download | ydb-8c039f0e189dfefc2f05e4f76c97ac5f804bb1f6.tar.gz | |
Don't use standalone GNU iconv in opensource
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libs/libiconv/ya.make | 20 | ||||
| -rw-r--r-- | contrib/libs/libxml/CMakeLists.darwin-x86_64.txt | 2 | ||||
| -rw-r--r-- | contrib/libs/libxml/CMakeLists.linux-aarch64.txt | 2 | ||||
| -rw-r--r-- | contrib/libs/libxml/CMakeLists.linux-x86_64.txt | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/contrib/libs/libiconv/ya.make b/contrib/libs/libiconv/ya.make index 3b32d4e226..6d6b1141b9 100644 --- a/contrib/libs/libiconv/ya.make +++ b/contrib/libs/libiconv/ya.make @@ -8,12 +8,20 @@ WITHOUT_LICENSE_TEXTS() NO_RUNTIME() -OPENSOURCE_EXPORT_REPLACEMENT( - CMAKE Iconv - CMAKE_TARGET Iconv::Iconv - CONAN libiconv/1.15 - CONAN_OPTIONS libiconv:shared=True -) +IF(OS_WINDOWS) + OPENSOURCE_EXPORT_REPLACEMENT( + CMAKE Iconv + CMAKE_TARGET Iconv::Iconv + CONAN libiconv/1.15 + CONAN_OPTIONS libiconv:shared=True + ) +ELSE() + # Opensource code is compatible with libc provided iconv API on major linux distributions and macos. + # * We prefere to avoid vendoring LGPL libraries in our opensouce project + # * Major distributions do not provide GNU libiconv as separate package + # * Shared lib dependencies from conan overcomplicate final artefacts distribution + DISABLE(OPENSOURCE_EXPORT) +ENDIF() IF (NOT EXPORT_CMAKE) diff --git a/contrib/libs/libxml/CMakeLists.darwin-x86_64.txt b/contrib/libs/libxml/CMakeLists.darwin-x86_64.txt index d593318062..7ea20cee7a 100644 --- a/contrib/libs/libxml/CMakeLists.darwin-x86_64.txt +++ b/contrib/libs/libxml/CMakeLists.darwin-x86_64.txt @@ -6,7 +6,6 @@ # original buildsystem will not be accepted. -find_package(Iconv REQUIRED) find_package(ZLIB REQUIRED) add_library(contrib-libs-libxml) @@ -26,7 +25,6 @@ target_include_directories(contrib-libs-libxml PRIVATE target_link_libraries(contrib-libs-libxml PUBLIC contrib-libs-cxxsupp yutil - Iconv::Iconv ZLIB::ZLIB library-cpp-charset ) diff --git a/contrib/libs/libxml/CMakeLists.linux-aarch64.txt b/contrib/libs/libxml/CMakeLists.linux-aarch64.txt index b607fa620b..0fd7e29e19 100644 --- a/contrib/libs/libxml/CMakeLists.linux-aarch64.txt +++ b/contrib/libs/libxml/CMakeLists.linux-aarch64.txt @@ -6,7 +6,6 @@ # original buildsystem will not be accepted. -find_package(Iconv REQUIRED) find_package(ZLIB REQUIRED) add_library(contrib-libs-libxml) @@ -27,7 +26,6 @@ target_link_libraries(contrib-libs-libxml PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp yutil - Iconv::Iconv ZLIB::ZLIB library-cpp-charset ) diff --git a/contrib/libs/libxml/CMakeLists.linux-x86_64.txt b/contrib/libs/libxml/CMakeLists.linux-x86_64.txt index b607fa620b..0fd7e29e19 100644 --- a/contrib/libs/libxml/CMakeLists.linux-x86_64.txt +++ b/contrib/libs/libxml/CMakeLists.linux-x86_64.txt @@ -6,7 +6,6 @@ # original buildsystem will not be accepted. -find_package(Iconv REQUIRED) find_package(ZLIB REQUIRED) add_library(contrib-libs-libxml) @@ -27,7 +26,6 @@ target_link_libraries(contrib-libs-libxml PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp yutil - Iconv::Iconv ZLIB::ZLIB library-cpp-charset ) |