sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build on 10.x and HEAD

Browse source 
PR:		ports/183442
Submitted by:	Oliver Fromme <oliver@fromme.com> (maintainer)
This commit is contained in:
Jason E. Hale 2013-10-30 12:46:44 +00:00
parent c6a2609e36
commit 25aa3e7c98
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=332099
1 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
devel/cssc/files/patch-unit-tests__googletest__include__gtest__internal__gtest-port.h Normal file
View file

@ -0,0 +1,52 @@
--- ./unit-tests/googletest/include/gtest/internal/gtest-port.h.orig 2010-05-15 18:30:14.000000000 -0400
+++ ./unit-tests/googletest/include/gtest/internal/gtest-port.h 2013-10-29 12:25:07.000000000 -0400
@@ -80,6 +80,7 @@
// the given platform; otherwise undefined):
// GTEST_OS_AIX - IBM AIX
// GTEST_OS_CYGWIN - Cygwin
+// GTEST_OS_FREEBSD - FreeBSD
// GTEST_OS_LINUX - Linux
// GTEST_OS_MAC - Mac OS X
// GTEST_OS_SOLARIS - Sun Solaris
@@ -219,10 +220,13 @@
#define GTEST_OS_SOLARIS 1
#elif defined(_AIX)
#define GTEST_OS_AIX 1
+#elif defined(__FreeBSD__)
+#define GTEST_OS_FREEBSD 1
+#define GTEST_USE_OWN_TR1_TUPLE 1
#endif // __CYGWIN__
#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \
- GTEST_OS_SOLARIS || GTEST_OS_AIX
+ GTEST_OS_SOLARIS || GTEST_OS_AIX || GTEST_OS_FREEBSD
// On some platforms, <regex.h> needs someone to define size_t, and
// won't compile otherwise. We can #include it here as we already
@@ -254,7 +258,8 @@
#define GTEST_USES_SIMPLE_RE 1
#endif // GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC ||
- // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_AIX
+ // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_AIX ||
+ // GTEST_OS_FREEBSD
#ifndef GTEST_HAS_EXCEPTIONS
// The user didn't tell us whether exceptions are enabled, so we need
@@ -376,7 +381,7 @@
//
// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
// to your compiler flags.
-#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC)
+#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_FREEBSD)
#endif // GTEST_HAS_PTHREAD
// Determines whether Google Test can use tr1/tuple. You can define
@@ -483,6 +488,7 @@
// abort() in a VC 7.1 application compiled as GUI in debug config
// pops up a dialog window that cannot be suppressed programmatically.
#if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
+ GTEST_OS_FREEBSD || \
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX)
#define GTEST_HAS_DEATH_TEST 1