Merge pull request #2223 from mavlink/pr-absl-fix

Fix illegal instruction on RPi 4

third_party/absl/CMakeLists.txt

@@ -29,7 +29,8 @@ endforeach()
 ExternalProject_add(
     absl
     GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
-    GIT_TAG 20230802.1
+    GIT_TAG 20240116.1
     PREFIX absl
+    PATCH_COMMAND git checkout . && git apply ${PROJECT_SOURCE_DIR}/rpi-no-crypto.patch
     CMAKE_ARGS "${CMAKE_ARGS}"
     )

third_party/absl/rpi-no-crypto.patch

@@ -0,0 +1,19 @@
+diff --git a/absl/random/internal/platform.h b/absl/random/internal/platform.h
+index d779f481..ea30118f 100644
+--- a/absl/random/internal/platform.h
++++ b/absl/random/internal/platform.h
+@@ -116,10 +116,10 @@
+
+ // http://infocenter.arm.com/help/topic/com.arm.doc.ihi0053c/IHI0053C_acle_2_0.pdf
+ // Rely on NEON+CRYPTO extensions for ARM.
+-#if defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO)
+-#undef ABSL_HAVE_ACCELERATED_AES
+-#define ABSL_HAVE_ACCELERATED_AES 1
+-#endif
++//#if defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO)
++//#undef ABSL_HAVE_ACCELERATED_AES
++//#define ABSL_HAVE_ACCELERATED_AES 1
++//#endif
+
+ #endif
+

third_party/grpc/CMakeLists.txt

@@ -53,7 +53,7 @@ endforeach()
 
 ExternalProject_add(
     grpc
-    URL https://github.com/grpc/grpc/archive/v1.60.0.tar.gz
+    URL https://github.com/grpc/grpc/archive/v1.61.1.tar.gz
     PREFIX grpc
     CMAKE_ARGS "${CMAKE_ARGS}"
     )