From: Noah Watkins <noahwatkins@gmail.com>
Date: Sun, 29 Dec 2013 18:01:38 +0000 (-0800)
Subject: gtest: disable tr1/tuple
X-Git-Tag: v0.75~20^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=424d7c78139a41f02ebc8f1a8da42e23569b86f8;p=ceph.git

gtest: disable tr1/tuple

Not all compilers are supporting tr1/tuple. This forces libgtest to use
an internal implementation of tuple. Alternatively, the newer 1.6
version of gtest may correctly handle this case automatically.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 6f6a17e9fad7..ba1d3dc08e3f 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -55,7 +55,8 @@ AM_COMMON_CPPFLAGS = \
 	-D__STDC_FORMAT_MACROS \
 	-D_GNU_SOURCE \
 	-DCEPH_LIBDIR=\"${libdir}\" \
-	-DCEPH_PKGLIBDIR=\"${pkglibdir}\"
+	-DCEPH_PKGLIBDIR=\"${pkglibdir}\" \
+	-DGTEST_HAS_TR1_TUPLE=0
 
 AM_COMMON_CFLAGS = \
 	-Wall \
diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am
index 8622e0a59351..435177d69806 100644
--- a/src/gtest/Makefile.am
+++ b/src/gtest/Makefile.am
@@ -169,7 +169,7 @@ EXTRA_DIST += $(m4data_DATA)
 
 # We define the global AM_CPPFLAGS as everything we compile includes from these
 # directories.
-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include -DGTEST_HAS_TR1_TUPLE=0
 
 # Modifies compiler and linker flags for pthreads compatibility.
 if HAVE_PTHREADS