diff options
| -rw-r--r-- | meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch | 43 |
1 files changed, 0 insertions, 43 deletions
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 @@ | |||
| 1 | From fd020ef700dbf2d324aecd087b8fcb6ff329feb6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jan Engelhardt <jengelh@inai.de> | ||
| 3 | Date: Thu, 21 Nov 2024 11:30:17 -0800 | ||
| 4 | Subject: [PATCH] utf8_range: add version marker to library (#19009) | ||
| 5 | |||
| 6 | Unversioned libraries / libraries without due ABI indicators are not allowed in certain Linux distributions because it precludes the concurrent presence of multiple versions. | ||
| 7 | |||
| 8 | 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. | ||
| 9 | |||
| 10 | Closes #19009 | ||
| 11 | |||
| 12 | COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/19009 from jengelh:master 1a5f8682be2f2b84da07fcdd32474baae8088959 | ||
| 13 | PiperOrigin-RevId: 698855702 | ||
| 14 | |||
| 15 | Upstream-Status: Backport [https://github.com/protocolbuffers/protobuf/commit/ced605d0e6a7ad20985375b596b2ca6720e07737] | ||
| 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 17 | --- | ||
| 18 | third_party/utf8_range/CMakeLists.txt | 9 +++++++++ | ||
| 19 | 1 file changed, 9 insertions(+) | ||
| 20 | |||
| 21 | diff --git a/third_party/utf8_range/CMakeLists.txt b/third_party/utf8_range/CMakeLists.txt | ||
| 22 | index 4276b97290..e054893c63 100644 | ||
| 23 | --- a/third_party/utf8_range/CMakeLists.txt | ||
| 24 | +++ b/third_party/utf8_range/CMakeLists.txt | ||
| 25 | @@ -19,6 +19,15 @@ add_library (utf8_range | ||
| 26 | # A heavier-weight C++ wrapper that supports Abseil. | ||
| 27 | add_library (utf8_validity utf8_validity.cc utf8_range.c) | ||
| 28 | |||
| 29 | +set_target_properties(utf8_range PROPERTIES | ||
| 30 | + VERSION ${protobuf_VERSION} | ||
| 31 | + OUTPUT_NAME ${LIB_PREFIX}utf8_range | ||
| 32 | +) | ||
| 33 | +set_target_properties(utf8_validity PROPERTIES | ||
| 34 | + VERSION ${protobuf_VERSION} | ||
| 35 | + OUTPUT_NAME ${LIB_PREFIX}utf8_validity | ||
| 36 | +) | ||
| 37 | + | ||
| 38 | # Load Abseil dependency. | ||
| 39 | if (NOT TARGET absl::strings) | ||
| 40 | if (NOT ABSL_ROOT_DIR) | ||
| 41 | -- | ||
| 42 | 2.34.1 | ||
| 43 | |||
