diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2014-01-16 17:17:15 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2014-01-16 17:17:15 +0000 |
| commit | 9dc680d0e8a2ff2a2bc6f286afbcd752ad9b22cd (patch) | |
| tree | 2667c705417cc324b38836cf8c9dc0dc6b6fc635 /biology/ugene/files/patch-gtest-std::tr1::tuple-fix | |
| parent | Update to 2.11 (diff) | |
- Update to version 1.13.0 and improve FreeBSD support; it also builds
pretty cleanly with GCC v4.2, v4.6, and Clang (modulo a few warnings)
- Sadly, do not use PORTDOCS: since DOCSDIR is set to be inside DATADIR,
and will get appended to PLIST after @dirrm %%DATADIR%%, which upsets
sanity checking tools; instead, list the docs explicitly in DISTFILES
and add them to pkg-plist (guarded by %%PORTDOCS%%)
Tested on: i386 (only)
Notes
Notes:
svn path=/head/; revision=339938
Diffstat (limited to 'biology/ugene/files/patch-gtest-std::tr1::tuple-fix')
| -rw-r--r-- | biology/ugene/files/patch-gtest-std::tr1::tuple-fix | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/biology/ugene/files/patch-gtest-std::tr1::tuple-fix b/biology/ugene/files/patch-gtest-std::tr1::tuple-fix deleted file mode 100644 index 655f6c86d153..000000000000 --- a/biology/ugene/files/patch-gtest-std::tr1::tuple-fix +++ /dev/null @@ -1,34 +0,0 @@ -commit 23699acca083589be9dc3b6e8e5c5d09f654648d -Author: marina.kolpakova <marina.kolpakova@itseez.com> -Date: Mon Oct 8 02:37:22 2012 +0400 - - fix for bug 2264 - - fix compilation OpenCV with cxx11 under Ubuntu with clang and gcc 4.7 - -diff --git a/modules/ts/include/opencv2/ts/ts_gtest.h b/modules/ts/include/opencv2/ts/ts_gtest.h -index f98f71b..42eb608 100644 ---- src/libs_3rdparty/gtest/src/gtest/internal/gtest-port.h.orig -+++ src/libs_3rdparty/gtest/src/gtest/internal/gtest-port.h -@@ -1654,7 +1654,21 @@ inline bool operator!=(const GTEST_10_TUPLE_(T)& t, - # undef _TR1_FUNCTIONAL // Allows the user to #include - // <tr1/functional> if he chooses to. - # else -+# if defined (__cplusplus) && __cplusplus > 199711L -+# include <tuple> -+namespace std { -+ namespace tr1 { -+ using std::tuple; -+ using std::tuple_element; -+ using std::get; -+ using std::tuple_size; -+ using std::make_tuple; -+ } -+} -+# else - # include <tr1/tuple> // NOLINT -+# endif -+ - # endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 - - # else |
