mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-10 14:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtest: sync with upstream Gentoo

Browse Source 
This includes a fix for building with gcc-4.7.

BUG=None
TEST=`emerge gtest` works
TEST=`emerge-amd64-generic gtest` works
TEST=`emerge-arm-generic gtest` works
TEST=`emerge-x86-generic gtest` works

Change-Id: I65984c3b362be2ae3fbc3ec0f7d4fdfd939f361d
Reviewed-on: https://gerrit.chromium.org/gerrit/23357
Reviewed-by: Yunlian Jiang <yunlian@chromium.org>
Reviewed-by: Han Shen <shenhan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-05-23 12:06:40 -04:00 committed by Gerrit
parent a52e74d417
commit aaef5bfc29
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.4.0-gcc-4.7.patch vendored Normal file
View File

@ -0,0 +1,32 @@
fix for upstream for building with newer gcc versions
r339 | zhanyong.wan | 2009-11-12 21:54:23 -0500 (Thu, 12 Nov 2009) | 2 lines
...; makes gtest-param-util-generated.h conform to the C++ standard (by Zhanyong Wan).
Index: include/gtest/internal/gtest-param-util-generated.h
===================================================================
--- include/gtest/internal/gtest-param-util-generated.h (revision 338)
+++ include/gtest/internal/gtest-param-util-generated.h (revision 339)
@@ -53,6 +53,21 @@
#if GTEST_HAS_PARAM_TEST
namespace testing {
+
+// Forward declarations of ValuesIn(), which is implemented in
+// include/gtest/gtest-param-test.h.
+template <typename ForwardIterator>
+internal::ParamGenerator<
+ typename ::std::iterator_traits<ForwardIterator>::value_type> ValuesIn(
+ ForwardIterator begin, ForwardIterator end);
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]);
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+ const Container& container);
+
namespace internal {
// Used in the Values() function to provide polymorphic capabilities.

7
sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.4.0.ebuild vendored
View File

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.4.0.ebuild,v 1.1 2011/11/11 20:09:57 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.4.0.ebuild,v 1.2 2012/04/20 18:18:06 vapier Exp $
EAPI="2"
inherit autotools eutils
@ -20,7 +20,8 @@ RDEPEND=""
src_prepare() {
sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die "sed failed"
epatch "${FILESDIR}/${P}-asneeded.patch"
epatch "${FILESDIR}"/${P}-asneeded.patch
epatch "${FILESDIR}"/${P}-gcc-4.7.patch
eautoreconf
}