From 6482f42200b27660c75806df7df055b584a62bbc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 12 Aug 2025 22:33:01 -0700 Subject: [PATCH] protobuf: Delete unused 0001-utf8_range-add-version-marker-to-library-19009.patch It is already present in 31.1 release anyway Signed-off-by: Khem Raj --- ...-add-version-marker-to-library-19009.patch | 43 ------------------- 1 file changed, 43 deletions(-) delete mode 100644 meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch deleted file mode 100644 index e58fdc1d19..0000000000 --- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fd020ef700dbf2d324aecd087b8fcb6ff329feb6 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Thu, 21 Nov 2024 11:30:17 -0800 -Subject: [PATCH] utf8_range: add version marker to library (#19009) - -Unversioned libraries / libraries without due ABI indicators are not allowed in certain Linux distributions because it precludes the concurrent presence of multiple versions. - -If you have both /usr/lib/libprotobuf-lite.so.28.3.0 and /usr/lib/libprotobuf-lite.so.29.0.0, both of them want libutf8_validity.so, but if the ABI is different between utf8_range 28 and utf8_range 29, that's a problem. - -Closes #19009 - -COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/19009 from jengelh:master 1a5f8682be2f2b84da07fcdd32474baae8088959 -PiperOrigin-RevId: 698855702 - -Upstream-Status: Backport [https://github.com/protocolbuffers/protobuf/commit/ced605d0e6a7ad20985375b596b2ca6720e07737] -Signed-off-by: Hongxu Jia ---- - third_party/utf8_range/CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/third_party/utf8_range/CMakeLists.txt b/third_party/utf8_range/CMakeLists.txt -index 4276b97290..e054893c63 100644 ---- a/third_party/utf8_range/CMakeLists.txt -+++ b/third_party/utf8_range/CMakeLists.txt -@@ -19,6 +19,15 @@ add_library (utf8_range - # A heavier-weight C++ wrapper that supports Abseil. - add_library (utf8_validity utf8_validity.cc utf8_range.c) - -+set_target_properties(utf8_range PROPERTIES -+ VERSION ${protobuf_VERSION} -+ OUTPUT_NAME ${LIB_PREFIX}utf8_range -+) -+set_target_properties(utf8_validity PROPERTIES -+ VERSION ${protobuf_VERSION} -+ OUTPUT_NAME ${LIB_PREFIX}utf8_validity -+) -+ - # Load Abseil dependency. - if (NOT TARGET absl::strings) - if (NOT ABSL_ROOT_DIR) --- -2.34.1 -