protobuf: fix compilation on armv6l (libatomic)

Author: meator

releases.json

@@ -3346,6 +3346,7 @@
       "protoc"
     ],
     "versions": [
+      "25.2-4",
       "25.2-3",
       "25.2-2",
       "25.2-1",

subprojects/packagefiles/protobuf/meson.build

@@ -37,6 +37,17 @@ absl_string_view_dep = dependency(
   default_options: ['cpp_std=c++17'],
 )
 
+if meson.version().version_compare('>=1.7.0')
+  atomic_dep = dependency('atomic')
+else
+  # Try to pick up libatomic. If it isn't available, hope that the host machine doesn't require it for atomics
+  # support. If it doesn't, protobuf will fail to compile.
+  atomic_dep = cc.find_library(
+    'atomic',
+    required: false,
+  )
+endif
+
 deps = [
   dependency('absl_base'),
   dependency('absl_cord'),
@@ -58,6 +69,7 @@ deps = [
     'dbghelp',
     required: host_machine.system() == 'windows',
   ),
+  atomic_dep,
 ]
 
 incdir = include_directories('src')
@@ -136,6 +148,7 @@ protobuf_lite_dep = declare_dependency(
   compile_args: imp,
   link_with: libprotobuf_lite,
   include_directories: incdir,
+  dependencies: atomic_dep,
 )
 
 libprotobuf_src = files(
@@ -218,8 +231,8 @@ libprotobuf_src = files(
   'src/google/protobuf/wrappers.pb.cc',
 )
 libprotobuf_linker_args = (is_msvc ? [
-  '/export:??$MergeFrom@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@RepeatedPtrFieldBase@internal@protobuf@google@@QEAAXAEBV0123@@Z',
-] : []
+    '/export:??$MergeFrom@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@RepeatedPtrFieldBase@internal@protobuf@google@@QEAAXAEBV0123@@Z',
+  ] : []
 )
 libprotobuf = library(
   'protobuf',