diff options
| author | joerg <joerg> | 2013-05-09 13:49:10 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-05-09 13:49:10 +0000 |
| commit | 11f695fbf54f4eb3f06b35aaf19b56cfccf4603d (patch) | |
| tree | 285402669d22e4a031c7a8d2ea20669ad2ea4e48 /devel | |
| parent | 1784bb9f39ecf067e86d83724bb6f345f69935f0 (diff) | |
| download | pkgsrc-11f695fbf54f4eb3f06b35aaf19b56cfccf4603d.tar.gz | |
Fake std::tr1 namespace for tuple and compile with C++11 for clang.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/googletest/Makefile | 7 | ||||
| -rw-r--r-- | devel/googletest/distinfo | 3 | ||||
| -rw-r--r-- | devel/googletest/patches/patch-include_gtest_internal_gtest-port.h | 21 |
3 files changed, 29 insertions, 2 deletions
diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile index bf7d62a699e..6e596028445 100644 --- a/devel/googletest/Makefile +++ b/devel/googletest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/31 11:17:03 asau Exp $ +# $NetBSD: Makefile,v 1.7 2013/05/09 13:49:10 joerg Exp $ # DISTNAME= gtest-1.6.0 @@ -31,6 +31,11 @@ SUBST_MESSAGE.fix-python= Fixing dynamic python SUBST_FILES.fix-python+= scripts/*py SUBST_SED.fix-python+= -e 's,/usr/bin/env python,${PYTHONBIN},' +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CXXFLAGS+= -std=c++11 +.endif + post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${DESTDIR}${PREFIX}/bin diff --git a/devel/googletest/distinfo b/devel/googletest/distinfo index f87c91ff656..a3f7c4338eb 100644 --- a/devel/googletest/distinfo +++ b/devel/googletest/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.4 2011/05/13 10:54:39 ryoon Exp $ +$NetBSD: distinfo,v 1.5 2013/05/09 13:49:10 joerg Exp $ SHA1 (gtest-1.6.0.zip) = 00d6be170eb9fc3b2198ffdcb1f1d6ba7fc6e621 RMD160 (gtest-1.6.0.zip) = ae4be5325f0cd83fea9902aa8674915ef2dcf8b4 Size (gtest-1.6.0.zip) = 1121697 bytes SHA1 (patch-Makefile.in) = f071727b3f8bc1c50837cc59dc87a20ff203ed72 SHA1 (patch-configure) = 7e11bf665760d489ad0bbb0806d2f88c7e335738 +SHA1 (patch-include_gtest_internal_gtest-port.h) = 9cbe09192266019723f498238bbaa92132adb27e diff --git a/devel/googletest/patches/patch-include_gtest_internal_gtest-port.h b/devel/googletest/patches/patch-include_gtest_internal_gtest-port.h new file mode 100644 index 00000000000..dae0865ff3f --- /dev/null +++ b/devel/googletest/patches/patch-include_gtest_internal_gtest-port.h @@ -0,0 +1,21 @@ +$NetBSD: patch-include_gtest_internal_gtest-port.h,v 1.1 2013/05/09 13:49:10 joerg Exp $ + +--- include/gtest/internal/gtest-port.h.orig 2013-05-03 14:50:43.000000000 +0000 ++++ include/gtest/internal/gtest-port.h +@@ -481,6 +481,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>. |