diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2023-10-06 12:58:59 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2023-10-06 13:28:47 +0300 |
| commit | 76e860bc8191aa0bde14d3d8096e725a6a75dc5d (patch) | |
| tree | 18bf7c0e8d1d1ac9a2776892c9c5fe87eceb2f51 | |
| parent | e228e132065cef8ee84cfa22073fec62b0d90d47 (diff) | |
| download | ydb-76e860bc8191aa0bde14d3d8096e725a6a75dc5d.tar.gz | |
Intermediate changes
| -rw-r--r-- | contrib/libs/libiconv/dynamic/ya.make | 5 | ||||
| -rw-r--r-- | contrib/libs/libiconv/static/ya.make | 7 | ||||
| -rw-r--r-- | contrib/libs/libiconv/ya.make | 34 |
3 files changed, 26 insertions, 20 deletions
diff --git a/contrib/libs/libiconv/dynamic/ya.make b/contrib/libs/libiconv/dynamic/ya.make index f8d2faf057..9d77f0ef71 100644 --- a/contrib/libs/libiconv/dynamic/ya.make +++ b/contrib/libs/libiconv/dynamic/ya.make @@ -3,11 +3,11 @@ DYNAMIC_LIBRARY(iconv) VERSION(1.13) LICENSE( - LGPL-2.0-only + LGPL-2.0-only AND LGPL-2.0-or-later ) -LICENSE_TEXTS(../.yandex_meta/licenses.list.txt) +LICENSE_TEXTS(.yandex_meta/licenses.list.txt) PROVIDES(libiconv) @@ -16,6 +16,7 @@ NO_RUNTIME() EXPORTS_SCRIPT(libiconv.exports) DYNAMIC_LIBRARY_FROM(contrib/libs/libiconv/static) + LICENSE_RESTRICTION_EXCEPTIONS(contrib/libs/libiconv/static) END() diff --git a/contrib/libs/libiconv/static/ya.make b/contrib/libs/libiconv/static/ya.make index df89458046..bb7ac6caf5 100644 --- a/contrib/libs/libiconv/static/ya.make +++ b/contrib/libs/libiconv/static/ya.make @@ -7,7 +7,7 @@ LICENSE( LGPL-2.0-or-later ) -LICENSE_TEXTS(../.yandex_meta/licenses.list.txt) +LICENSE_TEXTS(.yandex_meta/licenses.list.txt) PROVIDES(libiconv) @@ -22,7 +22,10 @@ IF (ARCADIA_ICONV_NOCJK) ENDIF() SRCDIR(contrib/libs/libiconv) -ADDINCL(GLOBAL contrib/libs/libiconv/include) + +ADDINCL( + GLOBAL contrib/libs/libiconv/include +) SRCS( iconv.c diff --git a/contrib/libs/libiconv/ya.make b/contrib/libs/libiconv/ya.make index 6d6b1141b9..f8e7fdce5c 100644 --- a/contrib/libs/libiconv/ya.make +++ b/contrib/libs/libiconv/ya.make @@ -8,12 +8,16 @@ WITHOUT_LICENSE_TEXTS() NO_RUNTIME() -IF(OS_WINDOWS) +IF (OS_WINDOWS) OPENSOURCE_EXPORT_REPLACEMENT( - CMAKE Iconv - CMAKE_TARGET Iconv::Iconv - CONAN libiconv/1.15 - CONAN_OPTIONS libiconv:shared=True + 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. @@ -24,17 +28,15 @@ ELSE() ENDIF() IF (NOT EXPORT_CMAKE) - -IF (USE_DYNAMIC_ICONV) - PEERDIR( - contrib/libs/libiconv/dynamic - ) -ELSE() - PEERDIR( - contrib/libs/libiconv/static - ) -ENDIF() - + IF (USE_DYNAMIC_ICONV) + PEERDIR( + contrib/libs/libiconv/dynamic + ) + ELSE() + PEERDIR( + contrib/libs/libiconv/static + ) + ENDIF() ENDIF() END() |