[vlc-devel] [PATCH 13/19] contrib: protobuf: disable for debug builds too

Steve Lhomme robux4 at videolabs.io
Wed Jun 14 14:02:02 CEST 2017


gcc 6.3.0 (mingw64) fails to build without this because of some macros
---
 contrib/src/protobuf/rules.mak | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index d8d958081b..693773337e 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -7,6 +7,10 @@ ifeq ($(call need_pkg,"protobuf"),)
 PKGS_FOUND += protobuf
 endif
 
+ifndef WITH_OPTIMIZATION
+PROTOBUF_DEBUG=-DNDEBUG
+endif
+
 $(TARBALLS)/protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz:
 	$(call download_pkg,$(PROTOBUF_URL),protobuf)
 
@@ -22,6 +26,6 @@ protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf
 
 .protobuf: protobuf
 	$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc="$(PROTOC)"
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(CFLAGS) $(PROTOBUF_DEBUG)" CXXFLAGS="$(CXXFLAGS) $(PROTOBUF_DEBUG)" --with-protoc="$(PROTOC)"
 	cd $< && $(MAKE) && $(MAKE) install
 	touch $@
-- 
2.12.1



More information about the vlc-devel mailing list