Skip to content

Commit fd054fa

Browse files
authored
firestore_snappy.patch.txt: fix linux gcc inlining build error (#895)
1 parent f889992 commit fd054fa

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

cmake/external/firestore_snappy.patch.txt

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ new file mode 100644
558558
index 000000000..9f25c03d0
559559
--- /dev/null
560560
+++ b/cmake/external/snappy.cmake
561-
@@ -0,0 +1,39 @@
561+
@@ -0,0 +1,40 @@
562562
+# Copyright 2022 Google LLC
563563
+#
564564
+# Licensed under the Apache License, Version 2.0 (the "License");
@@ -595,6 +595,25 @@ index 000000000..9f25c03d0
595595
+ BUILD_COMMAND ""
596596
+ INSTALL_COMMAND ""
597597
+ TEST_COMMAND ""
598+
+ PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/snappy.patch
598599
+
599600
+ HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
600601
+)
602+
diff --git a/cmake/external/snappy.patch b/cmake/external/snappy.patch
603+
new file mode 100644
604+
index 000000000..28bfb0837
605+
--- /dev/null
606+
+++ b/cmake/external/snappy.patch
607+
@@ -0,0 +1,12 @@
608+
+diff -Naur snappy/snappy.cc snappy_patched/snappy.cc
609+
+--- snappy/snappy.cc 2022-04-12 20:44:55.000000000 -0400
610+
++++ snappy_patched/snappy.cc 2022-04-12 20:47:05.000000000 -0400
611+
+@@ -1014,7 +1014,7 @@
612+
+ }
613+
+
614+
+ SNAPPY_ATTRIBUTE_ALWAYS_INLINE
615+
+-size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
616+
++inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
617+
+ const uint8_t*& ip = *ip_p;
618+
+ // This section is crucial for the throughput of the decompression loop.
619+
+ // The latency of an iteration is fundamentally constrained by the

0 commit comments

Comments
 (0)