diff options
| author | robot-piglet <[email protected]> | 2023-09-16 23:15:53 +0300 | 
|---|---|---|
| committer | robot-piglet <[email protected]> | 2023-09-16 23:26:24 +0300 | 
| commit | 96ed41f20bb88fafcfd4169145c4daac9c8d104d (patch) | |
| tree | 9ecb875fb23d430944b2925ef631013bfc9a1fd4 | |
| parent | d6c30abe1681f3df2856f9eea39ed5f500326cc6 (diff) | |
Intermediate changes
| -rw-r--r-- | contrib/libs/openssl/crypto/ya.make | 15 | ||||
| -rw-r--r-- | contrib/libs/openssl/ya.make | 14 | ||||
| -rw-r--r-- | contrib/libs/zlib/ya.make | 12 | 
3 files changed, 41 insertions, 0 deletions
diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make index e32d321467b..685889e4e7c 100644 --- a/contrib/libs/openssl/crypto/ya.make +++ b/contrib/libs/openssl/crypto/ya.make @@ -13,6 +13,16 @@ LICENSE(  LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +# TODO(YMAKE-92) Move this information out of ya.make and allow per project configuration +IF(OPENSOURCE_PROJECT == "CATBOOST") +    OPENSOURCE_EXPORT_REPLACEMENT( +        CMAKE OpenSSL +        CMAKE_PACKAGE_COMPONENT Crypto +        CMAKE_TARGET OpenSSL::Crypto +        CONAN openssl/1.1.1t +    ) +ENDIF() +  PEERDIR(      contrib/libs/zlib      library/cpp/sanitizer/include @@ -27,6 +37,9 @@ ADDINCL(      contrib/libs/openssl/include  ) +# TODO(YMAKE-92) Move this information out of ya.make and allow per project configuration +IF (NOT EXPORT_CMAKE OR OPENSOURCE_PROJECT != "CATBOOST") +  IF (OS_LINUX)      IF (ARCH_ARM64)          SET(LINUX_ARM64 yes) @@ -1366,4 +1379,6 @@ IF (ARCADIA_OPENSSL_DISABLE_ARMV7_TICK)      )  ENDIF() +ENDIF() +  END() diff --git a/contrib/libs/openssl/ya.make b/contrib/libs/openssl/ya.make index 5fe52b3f656..3611f0eee97 100644 --- a/contrib/libs/openssl/ya.make +++ b/contrib/libs/openssl/ya.make @@ -6,6 +6,15 @@ VERSION(1.1.1t)  ORIGINAL_SOURCE(https://github.com/openssl/openssl/archive/OpenSSL_1_1_1t.tar.gz) +# TODO(YMAKE-92) Move this information out of ya.make and allow per project configuration +IF(OPENSOURCE_PROJECT == "CATBOOST") +    OPENSOURCE_EXPORT_REPLACEMENT( +        CMAKE OpenSSL +        CMAKE_TARGET OpenSSL::OpenSSL +        CONAN openssl/1.1.1t +    ) +ENDIF() +  LICENSE(      Apache-2.0 AND      BSD-2-Clause AND @@ -28,6 +37,9 @@ ADDINCL(      contrib/libs/openssl  ) +# TODO(YMAKE-92) Move this information out of ya.make and allow per project configuration +IF (NOT EXPORT_CMAKE OR OPENSOURCE_PROJECT != "CATBOOST") +  IF (OS_LINUX)      IF (ARCH_ARM64)          SET(LINUX_ARM64 yes) @@ -332,6 +344,8 @@ IF (OS_ANDROID AND ARCH_ARM64)      )  ENDIF() +ENDIF() +  END()  RECURSE( diff --git a/contrib/libs/zlib/ya.make b/contrib/libs/zlib/ya.make index a29edbc6e22..2b45e351eef 100644 --- a/contrib/libs/zlib/ya.make +++ b/contrib/libs/zlib/ya.make @@ -10,6 +10,18 @@ VERSION(1.3)  ORIGINAL_SOURCE(https://github.com/madler/zlib/archive/v1.3.tar.gz) +# TODO(YMAKE-92) Move this information out of ya.make and allow per project configuration +IF(OPENSOURCE_PROJECT == "CATBOOST") +    OPENSOURCE_EXPORT_REPLACEMENT( +        CMAKE +        ZLIB +        CMAKE_TARGET +        ZLIB::ZLIB +        CONAN +        zlib/1.3 +    ) +ENDIF() +  ADDINCL(      GLOBAL contrib/libs/zlib/include  )  | 
