[Pkg-protobuf-devel] Bug#835266: protobuf: FTBFS with GCC 6: "misleading indentation"

Sebastiaan Couwenberg sebastic at xs4all.nl
Tue Aug 23 23:25:24 UTC 2016


Control: tags -1 patch
Control: block 835170 by -1

Because this issue is affecting most architectures, and blocks rebuilds 
of the reverse dependencies for the transition, I've had a look at 
fixing this.

The attached debdiff fixes the issue by adding 
-Wno-error=misleading-indentation whenever -Werror is used and has been 
tested in an uptodate i386 sid chroot.

Kind Regards,

Bas

-- 
  GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1
-------------- next part --------------
diff -Nru protobuf-3.0.0/debian/changelog protobuf-3.0.0/debian/changelog
--- protobuf-3.0.0/debian/changelog	2016-08-22 07:35:08.000000000 +0200
+++ protobuf-3.0.0/debian/changelog	2016-08-24 00:03:46.000000000 +0200
@@ -1,3 +1,10 @@
+protobuf (3.0.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add -Wno-error=misleading-indentation to fix FTBFS.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 24 Aug 2016 00:03:03 +0200
+
 protobuf (3.0.0-1) unstable; urgency=low
 
   * Team upload.
diff -Nru protobuf-3.0.0/debian/patches/misleading-indentation.patch protobuf-3.0.0/debian/patches/misleading-indentation.patch
--- protobuf-3.0.0/debian/patches/misleading-indentation.patch	1970-01-01 01:00:00.000000000 +0100
+++ protobuf-3.0.0/debian/patches/misleading-indentation.patch	2016-08-24 00:53:00.000000000 +0200
@@ -0,0 +1,33 @@
+Description: Don't treat misleading-indentation warning as error, causes FTBFS.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/more_tests/Makefile
++++ b/more_tests/Makefile
+@@ -37,5 +37,5 @@ header_warning_test.cc: target
+ header_warning_test: header_warning_test.cc
+ 	# TODO(kenton):  Consider adding -pedantic and -Weffc++.  Currently these
+ 	#   produce tons of extra warnings so we'll need to do some work first.
+-	g++ -Itarget/include -Wall -Werror -Wsign-compare -O2 -c header_warning_test.cc
++	g++ -Itarget/include -Wall -Werror -Wno-error=misleading-indentation -Wsign-compare -O2 -c header_warning_test.cc
+ 	touch header_warning_test
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -190,6 +190,7 @@ if __name__ == '__main__':
+ 
+     if warnings_as_errors in sys.argv:
+       extra_compile_args.append('-Werror')
++      extra_compile_args.append('-Wno-error=misleading-indentation')
+       sys.argv.remove(warnings_as_errors)
+ 
+     # C++ implementation extension
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -852,7 +852,7 @@ no_warning_test_LDADD = $(PTHREAD_LIBS)
+                         ../gmock/gtest/lib/libgtest_main.la
+ no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include
+ no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \
+-                           -Wall -Werror
++                           -Wall -Werror -Wno-error=misleading-indentation
+ nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs)
+ 
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
diff -Nru protobuf-3.0.0/debian/patches/series protobuf-3.0.0/debian/patches/series
--- protobuf-3.0.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ protobuf-3.0.0/debian/patches/series	2016-08-24 00:40:24.000000000 +0200
@@ -0,0 +1 @@
+misleading-indentation.patch


More information about the Pkg-protobuf-devel mailing list