Intermediate changes

.piglet-meta.json

@@ -0,0 +1,3 @@
+{
+  "project":"ydblib"
+}

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

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)

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)

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()

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"

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"