[vlc-devel] [PATCH v2 07/13] contrib: protobuf: don't configure gmock

Steve Lhomme robux4 at ycbcr.xyz
Tue Mar 24 15:46:25 CET 2020


It takes a lot of time for something we don't use.
---
 contrib/src/protobuf/protobuf-disable-gmock.patch | 11 +++++++++++
 contrib/src/protobuf/rules.mak                    |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 contrib/src/protobuf/protobuf-disable-gmock.patch

diff --git a/contrib/src/protobuf/protobuf-disable-gmock.patch b/contrib/src/protobuf/protobuf-disable-gmock.patch
new file mode 100644
index 0000000000..5402e5424c
--- /dev/null
+++ b/contrib/src/protobuf/protobuf-disable-gmock.patch
@@ -0,0 +1,11 @@
+--- protobuf/configure.ac.gmock	2016-09-24 04:12:20.000000000 +0200
++++ protobuf/configure.ac	2020-03-24 14:46:28.900969300 +0100
+@@ -183,7 +183,7 @@ AM_CONDITIONAL([OBJC_CONFORMANCE_TEST],
+ #   too.
+ export CFLAGS
+ export CXXFLAGS
+-AC_CONFIG_SUBDIRS([gmock])
++dnl AC_CONFIG_SUBDIRS([gmock])
+ 
+ AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
+ AC_OUTPUT
diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index e997b69526..50686e33e5 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -35,6 +35,7 @@ endif
 protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf
 	$(UNPACK)
 	mv protobuf-$(PROTOBUF_VERSION) protobuf-$(PROTOBUF_VERSION)-cpp
+	$(APPLY) $(SRC)/protobuf/protobuf-disable-gmock.patch
 	$(APPLY) $(SRC)/protobuf/dont-build-protoc.patch
 	$(MOVE)
 
-- 
2.17.1



More information about the vlc-devel mailing list