← Back to branch summary

~ubuntu-branches/debian/wheezy/protobuf/wheezy

« back to all changes in this revision

Viewing changes to debian/patches/fix-ftbfs-gcc4.7-kfreebsd.patch

  • Committer: Package Import Robot
  • Author(s): Iustin Pop
  • Date: 2012-06-17 18:29:37 UTC
  • Revision ID: package-import@ubuntu.com-20120617182937-vpmm3dpmh00pvthy
Tags: 2.4.1-3
http://bugs.debian.org/675837
Add patch from Steven Chamberlain fixing build failures of the
embedded gtest copy on kFreeBSD (Closes: #675837)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-ftbfs-gcc4.7-kfreebsd.patch
 
1
Description: fix GCC 4.7 build on 'other' platforms like GNU/kFreeBSD
 
2
 Assume that all platforms in the 'other' category will have unistd.h;
 
3
 as of GCC 4.7 they are going to have to include it.
 
4
Author: Steven Chamberlain <steven@pyro.eu.org>
 
5
 
 
6
--- protobuf-2.4.1.orig/gtest/include/gtest/internal/gtest-port.h       2011-04-30 18:22:13.000000000 +0100
 
7
+++ protobuf-2.4.1/gtest/include/gtest/internal/gtest-port.h    2012-06-11 14:18:19.000000000 +0100
 
8
@@ -231,6 +231,9 @@
 
9
 
 
10
 #else
 
11
 
 
12
+// Assume other platforms have unistd.h
 
13
+#include <unistd.h>  // NOLINT
 
14
+
 
15
 // <regex.h> may not be available on this platform.  Use our own
 
16
 // simple regex implementation instead.
 
17
 #define GTEST_USES_SIMPLE_RE 1