Bug 2011393 - Fix build issue on Solaris/gcc. r=TYLin

Solaris is that `char` and `int8_t` are the same type, so diplomat's
helper function causes redefinition errors.

So we need to add a special guard for Solaris to avoid the redefinition.

Differential Revision: https://phabricator.services.mozilla.com/D279979

Author: makotokato

intl/icu4x-patches/002-bug2011393.patch

@@ -0,0 +1,38 @@
+diff --git a/intl/icu_capi/bindings/cpp/icu4x/diplomat_runtime.hpp b/intl/icu_capi/bindings/cpp/icu4x/diplomat_runtime.hpp
+index 2ef428fe024b..2d036b1d4ea5 100644
+--- a/intl/icu_capi/bindings/cpp/icu4x/diplomat_runtime.hpp
++++ b/intl/icu_capi/bindings/cpp/icu4x/diplomat_runtime.hpp
+@@ -372,17 +372,21 @@ struct diplomat_c_span_convert {
+   struct diplomat_c_span_convert<T, std::enable_if_t<std::is_same_v<T, span<const c_ty>>>> { \
+     using type = diplomat::capi::Diplomat##name##View; \
+   }; \
+   template<typename T> \
+   struct diplomat_c_span_convert<T, std::enable_if_t<std::is_same_v<T, span<c_ty>>>> { \
+     using type = diplomat::capi::Diplomat##name##ViewMut; \
+   }; \
+ 
++#if !defined(__sun) || !defined(_CHAR_IS_SIGNED)
++// int8_t and char are the same type on Solaris. Guard this definition to avoid
++// conflicts. https://github.com/rust-diplomat/diplomat/issues/1015
+ MAKE_SLICE_CONVERTERS(I8, int8_t)
++#endif
+ MAKE_SLICE_CONVERTERS(U8, uint8_t)
+ MAKE_SLICE_CONVERTERS(I16, int16_t)
+ MAKE_SLICE_CONVERTERS(U16, uint16_t)
+ MAKE_SLICE_CONVERTERS(I32, int32_t)
+ MAKE_SLICE_CONVERTERS(U32, uint32_t)
+ MAKE_SLICE_CONVERTERS(I64, int64_t)
+ MAKE_SLICE_CONVERTERS(U64, uint64_t)
+ MAKE_SLICE_CONVERTERS(F32, float)
+@@ -559,9 +563,9 @@ struct next_to_iter_helper {
+   }
+ 
+   std::shared_ptr<T> _ptr; // shared to satisfy the copyable requirement
+   next_type _curr;
+ };
+ 
+ } // namespace diplomat
+ } // namespace icu4x
+-#endif
+\ No newline at end of file
++#endif

intl/icu4x-patches/README

@@ -2,17 +2,9 @@
 
 A patch for Cargo.toml of icu_capi. Remove weak dependencies of unnecessary crates.
 
-### 002-GH4109.patch
+### 002-bug2011393.patch
 
-A patch for icu_capi for clang and static analysis.
-
-### 003-explicit.patch
-
-A patch for icu_capi to add explicit keyword
-
-### 004-dead-code.patch
-
-A patch for icu_capi to mark the ICU4XDataStruct as dead code as it's never read from Rust.
+A patch for Solaris support. int8_t and char are the same type on Solaris. Guard this definition to avoid conflicts. https://github.com/rust-diplomat/diplomat/issues/1015
 
 ### empty.toml
 

intl/icu_capi/bindings/cpp/icu4x/diplomat_runtime.hpp

@@ -377,7 +377,11 @@ struct diplomat_c_span_convert {
     using type = diplomat::capi::Diplomat##name##ViewMut; \
   }; \
 
+#if !defined(__sun) || !defined(_CHAR_IS_SIGNED)
+// int8_t and char are the same type on Solaris. Guard this definition to avoid
+// conflicts. https://github.com/rust-diplomat/diplomat/issues/1015
 MAKE_SLICE_CONVERTERS(I8, int8_t)
+#endif
 MAKE_SLICE_CONVERTERS(U8, uint8_t)
 MAKE_SLICE_CONVERTERS(I16, int16_t)
 MAKE_SLICE_CONVERTERS(U16, uint16_t)
@@ -564,4 +568,4 @@ struct next_to_iter_helper {
 
 } // namespace diplomat
 } // namespace icu4x
-#endif
+#endif

intl/update-icu4x.sh

@@ -81,6 +81,7 @@ rm -rf icu_capi_tar.gz
 log "Patching icu_capi"
 for patch in \
     001-Cargo.toml.patch \
+    002-bug2011393.patch \
 ; do
     patch -d ${top_src_dir} -p1 --no-backup-if-mismatch < ${top_src_dir}/intl/icu4x-patches/$patch
 done