tools: Fix protobuf compiler build with recent compilers

This is a manual backport of protocolbuffers/protobuf@01a05a5
bharatgl · Dec 14, 2021 · c580054 · c580054
1 parent 8758a17
commit c580054
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/extras/tools/protobuf-fix-build.patch b/extras/tools/protobuf-fix-build.patch
@@ -0,0 +1,11 @@
+--- protobuf/src/google/protobuf/compiler/java/java_file.cc.old	2021-12-13 14:57:55.210153925 +0100
++++ protobuf/src/google/protobuf/compiler/java/java_file.cc	2021-12-13 14:58:03.734181392 +0100
+@@ -65,7 +65,7 @@
+ namespace {
+
+ struct FieldDescriptorCompare {
+-  bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) {
++  bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) const {
+     if(f1 == NULL) {
+       return false;
+     }
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
@@ -315,6 +315,7 @@ protobuf-$(PROTOBUF_VERSION).tar.gz:
 
 protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz
 	$(UNPACK)
+	$(APPLY) $(TOOLS)/protobuf-fix-build.patch
 	$(MOVE)
 
 .buildprotoc: protobuf