From owner-svn-ports-all@FreeBSD.ORG Thu Nov 7 02:52:11 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5F530B09; Thu, 7 Nov 2013 02:52:11 +0000 (UTC) (envelope-from clsung@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4C37C238E; Thu, 7 Nov 2013 02:52:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA72qB2Y065288; Thu, 7 Nov 2013 02:52:11 GMT (envelope-from clsung@svn.freebsd.org) Received: (from clsung@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA72qAH7065286; Thu, 7 Nov 2013 02:52:10 GMT (envelope-from clsung@svn.freebsd.org) Message-Id: <201311070252.rA72qAH7065286@svn.freebsd.org> From: Cheng-Lung Sung Date: Thu, 7 Nov 2013 02:52:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333054 - in head/devel/googletest: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Nov 2013 02:52:11 -0000 Author: clsung Date: Thu Nov 7 02:52:10 2013 New Revision: 333054 URL: http://svnweb.freebsd.org/changeset/ports/333054 Log: convert to STAGE Modified: head/devel/googletest/Makefile head/devel/googletest/files/patch-include_gtest_internal_gtest-port.h Modified: head/devel/googletest/Makefile ============================================================================== --- head/devel/googletest/Makefile Thu Nov 7 02:51:51 2013 (r333053) +++ head/devel/googletest/Makefile Thu Nov 7 02:52:10 2013 (r333054) @@ -14,7 +14,6 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PYTHON_BUILD= yes -NO_STAGE= yes regression-test: cd ${WRKSRC}; ${MAKE} check Modified: head/devel/googletest/files/patch-include_gtest_internal_gtest-port.h ============================================================================== --- head/devel/googletest/files/patch-include_gtest_internal_gtest-port.h Thu Nov 7 02:51:51 2013 (r333053) +++ head/devel/googletest/files/patch-include_gtest_internal_gtest-port.h Thu Nov 7 02:52:10 2013 (r333054) @@ -1,5 +1,5 @@ ---- include/gtest/internal/gtest-port.h.orig 2010-04-15 22:02:02.000000000 +0000 -+++ include/gtest/internal/gtest-port.h +--- include/gtest/internal/gtest-port.h.orig 2010-04-16 06:02:02.000000000 +0800 ++++ include/gtest/internal/gtest-port.h 2013-10-16 23:39:02.000000000 +0800 @@ -173,6 +173,7 @@ #include #include @@ -8,3 +8,12 @@ #ifndef _WIN32_WCE #include #endif // !_WIN32_WCE +@@ -399,7 +400,7 @@ + // defining __GNUC__ and friends, but cannot compile GCC's tuple + // implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB + // Feature Pack download, which we cannot assume the user has. +-#if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \ ++#if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(_LIBCPP_VERSION) && (GTEST_GCC_VER_ >= 40000)) \ + || _MSC_VER >= 1600 + #define GTEST_USE_OWN_TR1_TUPLE 0 + #else