diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2024-08-14 17:29:17 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2024-08-14 17:53:44 +0300 |
| commit | 0cde7699c40c90a05b1545e8f58abeb41cc4718e (patch) | |
| tree | 43938ce443281a992b6b3e5188bb7ae53d7ad203 | |
| parent | 91c27c5353120c77223f96ae7b3942fbbc269185 (diff) | |
| download | ydb-0cde7699c40c90a05b1545e8f58abeb41cc4718e.tar.gz | |
Intermediate changes
| -rw-r--r-- | .piglet-meta.json | 3 | ||||
| -rw-r--r-- | contrib/libs/libiconv/ya.make | 6 | ||||
| -rw-r--r-- | contrib/libs/linux-headers/ya.make | 17 | ||||
| -rw-r--r-- | contrib/libs/openssl/crypto/ya.make | 2 | ||||
| -rw-r--r-- | contrib/libs/openssl/ya.make | 2 | ||||
| -rw-r--r-- | contrib/libs/protobuf/ya.make | 3 | ||||
| -rw-r--r-- | contrib/libs/protoc/ya.make | 3 |
7 files changed, 18 insertions, 18 deletions
diff --git a/.piglet-meta.json b/.piglet-meta.json new file mode 100644 index 0000000000..a733cd2ea9 --- /dev/null +++ b/.piglet-meta.json @@ -0,0 +1,3 @@ +{ + "project":"ydblib" +}
\ No newline at end of file diff --git a/contrib/libs/libiconv/ya.make b/contrib/libs/libiconv/ya.make index 5fb2655c64..e0a74166de 100644 --- a/contrib/libs/libiconv/ya.make +++ b/contrib/libs/libiconv/ya.make @@ -18,7 +18,7 @@ IF (EXPORT_CMAKE) CMAKE_TARGET Iconv::Iconv CONAN - libiconv/1.15 "&& conan-requires" libiconv/1.15 + libiconv/1.15 CONAN_OPTIONS libiconv:shared=True ) @@ -35,12 +35,10 @@ ELSEIF (USE_ICONV == "dynamic") ) ELSEIF (USE_ICONV == "local") GLOBAL_CFLAGS(${USE_LOCAL_ICONV_CFLAGS}) - IF (OS_DARWIN) LDFLAGS(-liconv) ENDIF() - - # Opensource code is compatible with libc provided iconv API on major linux distributions and macos. +# Opensource code is compatible with libc provided iconv API on major linux distributions and macos. ELSE() PEERDIR( contrib/libs/libiconv/static diff --git a/contrib/libs/linux-headers/ya.make b/contrib/libs/linux-headers/ya.make index ac195d21a8..8d06604701 100644 --- a/contrib/libs/linux-headers/ya.make +++ b/contrib/libs/linux-headers/ya.make @@ -31,20 +31,21 @@ VERSION(6.5.9) ORIGINAL_SOURCE(mirror://kernel/linux/kernel/v6.x/linux-6.5.9.tar.xz) IF (OPENSOURCE_REPLACE_LINUX_HEADERS AND EXPORT_CMAKE) - - OPENSOURCE_EXPORT_REPLACEMENT( - CMAKE linux-headers-generic - CMAKE_TARGET linux-headers-generic::linux-headers-generic - CONAN linux-headers-generic/${OPENSOURCE_REPLACE_LINUX_HEADERS} "&& conan-requires" linux-headers-generic/${OPENSOURCE_REPLACE_LINUX_HEADERS} + OPENSOURCE_EXPORT_REPLACEMENT_BY_OS( + OS + Linux + CMAKE + linux-headers-generic + CMAKE_TARGET + linux-headers-generic::linux-headers-generic + CONAN + linux-headers-generic/${OPENSOURCE_REPLACE_LINUX_HEADERS} ) - ELSE() - ADDINCL( GLOBAL contrib/libs/linux-headers GLOBAL contrib/libs/linux-headers/_nf ) - ENDIF() DISABLE(NEED_PLATFORM_PEERDIRS) diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make index d5d764f331..c6e9d82018 100644 --- a/contrib/libs/openssl/crypto/ya.make +++ b/contrib/libs/openssl/crypto/ya.make @@ -19,7 +19,7 @@ IF (OPENSOURCE_REPLACE_OPENSSL) CMAKE OpenSSL CMAKE_PACKAGE_COMPONENT Crypto CMAKE_TARGET OpenSSL::Crypto - CONAN openssl/${OPENSOURCE_REPLACE_OPENSSL} "&& conan-requires" openssl/${OPENSOURCE_REPLACE_OPENSSL} + CONAN openssl/${OPENSOURCE_REPLACE_OPENSSL} ) ENDIF() # IF (OPENSOURCE_REPLACE_OPENSSL) diff --git a/contrib/libs/openssl/ya.make b/contrib/libs/openssl/ya.make index faec0b51eb..802b2c76c3 100644 --- a/contrib/libs/openssl/ya.make +++ b/contrib/libs/openssl/ya.make @@ -11,7 +11,7 @@ IF (OPENSOURCE_REPLACE_OPENSSL AND EXPORT_CMAKE) OPENSOURCE_EXPORT_REPLACEMENT( CMAKE OpenSSL CMAKE_TARGET OpenSSL::OpenSSL - CONAN openssl/${OPENSOURCE_REPLACE_OPENSSL} "&& conan-requires" openssl/${OPENSOURCE_REPLACE_OPENSSL} + CONAN openssl/${OPENSOURCE_REPLACE_OPENSSL} ) ELSE() diff --git a/contrib/libs/protobuf/ya.make b/contrib/libs/protobuf/ya.make index ec90ec4cd6..1208fd114e 100644 --- a/contrib/libs/protobuf/ya.make +++ b/contrib/libs/protobuf/ya.make @@ -24,8 +24,7 @@ IF (OPENSOURCE_REPLACE_PROTOBUF AND EXPORT_CMAKE) protobuf::libprotoc CONAN protobuf/${OPENSOURCE_REPLACE_PROTOBUF} - "&& conan-requires" - protobuf/${OPENSOURCE_REPLACE_PROTOBUF} + CONAN_ADDITIONAL_SEMS "&& conan_require_tool" protobuf/${OPENSOURCE_REPLACE_PROTOBUF} "&& conan-tool_requires" diff --git a/contrib/libs/protoc/ya.make b/contrib/libs/protoc/ya.make index 95b81598a2..5af83f2258 100644 --- a/contrib/libs/protoc/ya.make +++ b/contrib/libs/protoc/ya.make @@ -22,8 +22,7 @@ IF (OPENSOURCE_REPLACE_PROTOBUF AND EXPORT_CMAKE) protobuf::libprotoc CONAN protobuf/${OPENSOURCE_REPLACE_PROTOBUF} - "&& conan-requires" - protobuf/${OPENSOURCE_REPLACE_PROTOBUF} + CONAN_ADDITIONAL_SEMS "&& conan_require_tool" protobuf/${OPENSOURCE_REPLACE_PROTOBUF} "&& conan-tool_requires" |