Fix protobuf v1 pipeline

conan-io · Sep 5, 2024 · b1cfbba · b1cfbba
1 parent bf241eb
commit b1cfbba
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/recipes/mysql-connector-cpp/all/conanfile.py b/recipes/mysql-connector-cpp/all/conanfile.py
@@ -136,7 +136,7 @@ def _patch_sources(self):
                             strict=False)
 
         # Fix shared zlib build = duplicate references
-        if self.options.shared and self.settings.os in ["Linux", "FreeBSD"] :
+        if self.settings.os in ["Linux", "FreeBSD"] :
             # ZLIB patch
             replace_in_file(self, os.path.join(self.source_folder, "cdk", "extra", "protobuf", "protobuf-3.19.6", "cmake", "CMakeLists.txt"),
                                 "set(protobuf_WITH_ZLIB_DEFAULT ON)",
@@ -149,13 +149,6 @@ def _patch_sources(self):
                                 "PRIVATE cdk_foundation ZLIB::ZLIB ext::lz4 ext::zstd",
                                 strict=False)
 
-        # Protobuf patches
-        replace_in_file(self, os.path.join(self.source_folder, "cdk", "protocol", "mysqlx", "CMakeLists.txt"),
-                                "target_link_libraries(cdk_proto_mysqlx",
-                                "target_link_libraries(cdk_proto_mysqlx PRIVATE ext::protobuf)\n"\
-                                "target_link_libraries(cdk_proto_mysqlx",
-                                strict=False)
-
         # Apple patches
         if is_apple_os(self) and cross_building(self):
             patch = f"set(CMAKE_OSX_ARCHITECTURES \"{self.settings.arch}\" CACHE INTERNAL \"\" FORCE)\n"