diff options
| author | joerg <joerg@pkgsrc.org> | 2013-05-09 20:06:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-05-09 20:06:09 +0000 |
| commit | 0b40f9b9b8250e6b0ea77f89496381c1648150da (patch) | |
| tree | 2249c6bf51860dc9d45db84df30e4e5fe9daf2e2 /devel | |
| parent | 3731f6984999c60ab4df15aa6808a2a66eae3dcf (diff) | |
| download | pkgsrc-0b40f9b9b8250e6b0ea77f89496381c1648150da.tar.gz | |
Patches to fix gtest.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/open-vcdiff/patches/patch-gflags_src_gflags.cc | 21 | ||||
| -rw-r--r-- | devel/open-vcdiff/patches/patch-gtest_include_gtest_internal_gtest-port.h | 30 |
2 files changed, 51 insertions, 0 deletions
diff --git a/devel/open-vcdiff/patches/patch-gflags_src_gflags.cc b/devel/open-vcdiff/patches/patch-gflags_src_gflags.cc new file mode 100644 index 00000000000..b723641dd13 --- /dev/null +++ b/devel/open-vcdiff/patches/patch-gflags_src_gflags.cc @@ -0,0 +1,21 @@ +$NetBSD: patch-gflags_src_gflags.cc,v 1.1 2013/05/09 20:06:09 joerg Exp $ + +--- gflags/src/gflags.cc.orig 2013-05-03 18:22:10.000000000 +0000 ++++ gflags/src/gflags.cc +@@ -358,13 +358,13 @@ string FlagValue::ToString() const { + case FV_BOOL: + return VALUE_AS(bool) ? "true" : "false"; + case FV_INT32: +- snprintf(intbuf, sizeof(intbuf), "%"PRId32, VALUE_AS(int32)); ++ snprintf(intbuf, sizeof(intbuf), "%" PRId32, VALUE_AS(int32)); + return intbuf; + case FV_INT64: +- snprintf(intbuf, sizeof(intbuf), "%"PRId64, VALUE_AS(int64)); ++ snprintf(intbuf, sizeof(intbuf), "%" PRId64, VALUE_AS(int64)); + return intbuf; + case FV_UINT64: +- snprintf(intbuf, sizeof(intbuf), "%"PRIu64, VALUE_AS(uint64)); ++ snprintf(intbuf, sizeof(intbuf), "%" PRIu64, VALUE_AS(uint64)); + return intbuf; + case FV_DOUBLE: + snprintf(intbuf, sizeof(intbuf), "%.17g", VALUE_AS(double)); diff --git a/devel/open-vcdiff/patches/patch-gtest_include_gtest_internal_gtest-port.h b/devel/open-vcdiff/patches/patch-gtest_include_gtest_internal_gtest-port.h new file mode 100644 index 00000000000..2341bb5bd6b --- /dev/null +++ b/devel/open-vcdiff/patches/patch-gtest_include_gtest_internal_gtest-port.h @@ -0,0 +1,30 @@ +$NetBSD: patch-gtest_include_gtest_internal_gtest-port.h,v 1.1 2013/05/09 20:06:09 joerg Exp $ + +--- gtest/include/gtest/internal/gtest-port.h.orig 2012-04-03 17:43:13.000000000 +0000 ++++ gtest/include/gtest/internal/gtest-port.h +@@ -36,6 +36,8 @@ + #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ + #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ + ++#include <unistd.h> ++ + // The user can define the following macros in the build script to + // control Google Test's behavior. If the user doesn't define a macro + // in this list, Google Test will define it. +@@ -415,6 +417,16 @@ + #define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED + #include <tuple> + ++# elif __cplusplus >= 201103L ++# include <tuple> ++namespace std { ++ namespace tr1 { ++ using ::std::tuple; ++ using ::std::tuple_element; ++ using ::std::tuple_size; ++ using ::std::get; ++ } ++} + #elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000) + // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does + // not conform to the TR1 spec, which requires the header to be <tuple>. |