intermediate changes

ref:219bc6cb00679bf7219c7a9eb813ac45d3cbd5d7

4 files changed, 13 insertions, 4 deletions

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index f515d457a3..0da2746399 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -2485,11 +2485,14 @@ module LIBRARY: _LIBRARY {
     }
     when ($CMAKE_PACKAGE != "") {
         CMAKE_FIND_PKG=find_package $CMAKE_PACKAGE $CMAKE_FIND_PKG_COMP
-        CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE && ignored
+        CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE $CONAN_OPTS_SEM && ignored
     }
     when ($CONAN_REFERENCE != "") {
         CONAN_REQUIRE=&& conan_require $CONAN_REFERENCE
-        CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE && ignored
+        CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE $CONAN_OPTS_SEM && ignored
+    }
+    when ($CONAN_PKG_OPTS != "") {
+        CONAN_OPTS_SEM=&& conan_options $CONAN_PKG_OPTS
     }
     when ($OPENSOURCE_EXPORT == "no") {
         CPP_LIBRARY_SEM=ignored
@@ -4320,7 +4323,8 @@ when ($USE_SYSTEM_JDK) {
 }
 otherwise {
     when ($JDK_REAL_VERSION == "17") {
-        JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17
+        # need jdk11 for spare parts in "host" platform
+        JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
     }
     when ($JDK_REAL_VERSION == "16") {
         JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk16 build/platform/java/jdk/jdk17
@@ -9386,15 +9390,17 @@ CMAKE_PACKAGE=
 CMAKE_PACKAGE_COMPONENT=
 CMAKE_PACKAGE_TARGET=
 CONAN_REFERENCE=
+CONAN_PKG_OPTS=
 ### @usage: OPENSOURCE_EXPORT_REPLACEMENT(CMAKE PkgName CMAKE_TARGET PkgName::PkgTarget CONAN ConanRef CMAKE_COMPONENT OptCmakePkgComponent)
 ###
 ### Use specified conan/system pacakcge when exporting cmake build scripts for arcadia C++ project
 ### for opensource publication.
-macro OPENSOURCE_EXPORT_REPLACEMENT(CMAKE[], CMAKE_TARGET[], CMAKE_COMPONENET[], CONAN[]) {
+macro OPENSOURCE_EXPORT_REPLACEMENT(CMAKE[], CMAKE_TARGET[], CMAKE_COMPONENET[], CONAN[], CONAN_OPTIONS[]) {
     SET(CMAKE_PACKAGE $CMAKE)
     SET(CMAKE_PACKAGE_COMPONENT $CMAKE_COMPONENET)
     SET(CMAKE_LINK_TARGET $CMAKE_TARGET)
     SET(CONAN_REFERENCE $CONAN)
+    SET(CONAN_PKG_OPTS $CONAN_OPTIONS)
 }
 
 # tag:licence
diff --git a/contrib/libs/libiconv/ya.make b/contrib/libs/libiconv/ya.make
index 19835cd87f..78076904b6 100644
--- a/contrib/libs/libiconv/ya.make
+++ b/contrib/libs/libiconv/ya.make
@@ -17,6 +17,7 @@ OPENSOURCE_EXPORT_REPLACEMENT(
     CMAKE Iconv
     CMAKE_TARGET Iconv::Iconv
     CONAN libiconv/1.15
+    CONAN_OPTIONS libiconv:shared=True
 )
 
 IF (NOT EXPORT_CMAKE)
diff --git a/contrib/libs/libidn/ya.make b/contrib/libs/libidn/ya.make
index 84fcd55c6c..876e675026 100644
--- a/contrib/libs/libidn/ya.make
+++ b/contrib/libs/libidn/ya.make
@@ -21,6 +21,7 @@ OPENSOURCE_EXPORT_REPLACEMENT(
     CMAKE libidn
     CMAKE_TARGET libidn::libidn
     CONAN libidn/1.36
+    CONAN_OPTIONS libidn:shared=True
 )
 
 IF (NOT EXPORT_CMAKE)
diff --git a/ydb/library/pdisk_io/CMakeLists.txt b/ydb/library/pdisk_io/CMakeLists.txt
index 64c0db91fb..c1264a99e2 100644
--- a/ydb/library/pdisk_io/CMakeLists.txt
+++ b/ydb/library/pdisk_io/CMakeLists.txt
@@ -14,6 +14,7 @@ target_link_libraries(ydb-library-pdisk_io PUBLIC
   yutil
   tools-enum_parser-enum_serialization_runtime
   AIO::aio
+  $CONAN_OPTS_SEM
   cpp-actors-core
   cpp-monlib-dynamic_counters
   ydb-core-debug