Attachment #145880 for bug #187562

Lines 2-8 Link Here

(-)googletest/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/devel/googletest/Makefile 358056 2014-06-16 22:21:25Z amdmi3 $	2	# $FreeBSD: head/devel/googletest/Makefile 358056 2014-06-16 22:21:25Z amdmi3 $
3		3
4	PORTNAME= googletest	4	PORTNAME= googletest
5	PORTVERSION= 1.5.0	5	PORTVERSION= 1.7.0
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= GOOGLE_CODE	8	MASTER_SITES= GOOGLE_CODE
Lines 11-17 Link Here
11	MAINTAINER= clsung@FreeBSD.org	11	MAINTAINER= clsung@FreeBSD.org
12	COMMENT= Framework for writing C++ tests on a variety of platforms	12	COMMENT= Framework for writing C++ tests on a variety of platforms
13		13
14	USES= shebangfix libtool	14	USES= zip libtool
15	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17	USE_PYTHON_BUILD= 2	17	USE_PYTHON_BUILD= 2

Lines 1-2 Link Here

(-)googletest/distinfo (-2 / +2 lines)
1	SHA256 (gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff	1	SHA256 (gtest-1.7.0.zip) = 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d
2	SIZE (gtest-1.5.0.tar.gz) = 896874	2	SIZE (gtest-1.7.0.zip) = 1164254




--- Makefile.am.orig	2014-08-15 23:56:28.287226361 +0100
+++ Makefile.am	2014-08-15 23:57:23.282342931 +0100
@@ -298,9 +298,7 @@
 # One-Definition Rule.
 
 install-exec-local:
-	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
-	false
+	true
 
 install-data-local:
-	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
-	false
+	true
--- Makefile.in.orig	2014-08-15 23:57:31.232361742 +0100
+++ Makefile.in	2014-08-15 23:57:54.219361789 +0100
@@ -1343,17 +1343,11 @@
 @HAVE_PYTHON_TRUE@maintainer-clean-local:
 @HAVE_PYTHON_TRUE@	rm -rf "$(srcdir)/fused-src"
 
-# Disables 'make install' as installing a compiled version of Google
-# Test can lead to undefined behavior due to violation of the
-# One-Definition Rule.
-
 install-exec-local:
-	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
-	false
+	true
 
 install-data-local:
-	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
-	false
+	true
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.




--- 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 <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #ifndef _WIN32_WCE
 #include <sys/stat.h>
 #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




--- include/gtest/internal/gtest-port.h.orig	2014-08-16 09:30:13.114359210 +0100
+++ include/gtest/internal/gtest-port.h	2014-08-16 09:32:56.496223003 +0100
@@ -92,6 +92,7 @@
 // the given platform; otherwise undefined):
 //   GTEST_OS_AIX      - IBM AIX
 //   GTEST_OS_CYGWIN   - Cygwin
+//   GTEST_OS_FREEBSD  - FreeBSD
 //   GTEST_OS_HPUX     - HP-UX
 //   GTEST_OS_LINUX    - Linux
 //     GTEST_OS_LINUX_ANDROID - Google Android
@@ -248,6 +249,8 @@
 #   define GTEST_OS_IOS_SIMULATOR 1
 #  endif
 # endif
+#elif defined __FreeBSD__
+# define GTEST_OS_FREEBSD 1
 #elif defined __linux__
 # define GTEST_OS_LINUX 1
 # if defined __ANDROID__
@@ -646,7 +649,7 @@
      (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \
      (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
      GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
-     GTEST_OS_OPENBSD || GTEST_OS_QNX)
+     GTEST_OS_FREEBSD || GTEST_OS_OPENBSD || GTEST_OS_QNX)
 # define GTEST_HAS_DEATH_TEST 1
 # include <vector>  // NOLINT
 #endif

Lines 1-7 Link Here

(-)googletest/pkg-plist (-1 / +1 lines)
1	bin/gtest-config
2	include/gtest/gtest-death-test.h	1	include/gtest/gtest-death-test.h
3	include/gtest/gtest-message.h	2	include/gtest/gtest-message.h
4	include/gtest/gtest-param-test.h	3	include/gtest/gtest-param-test.h
		4	include/gtest/gtest-printers.h
5	include/gtest/gtest-spi.h	5	include/gtest/gtest-spi.h
6	include/gtest/gtest-test-part.h	6	include/gtest/gtest-test-part.h
7	include/gtest/gtest-typed-test.h	7	include/gtest/gtest-typed-test.h

Return to bug 187562

Line 0 Link Here

(-)googletest/files/patch-allow-install (+36 lines)
	1	--- Makefile.am.orig 2014-08-15 23:56:28.287226361 +0100
	2	+++ Makefile.am 2014-08-15 23:57:23.282342931 +0100
	3	@@ -298,9 +298,7 @@
	4	# One-Definition Rule.
	5
	6	install-exec-local:
	7	- echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
	8	- false
	9	+ true
	10
	11	install-data-local:
	12	- echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
	13	- false
	14	+ true
	15	--- Makefile.in.orig 2014-08-15 23:57:31.232361742 +0100
	16	+++ Makefile.in 2014-08-15 23:57:54.219361789 +0100
	17	@@ -1343,17 +1343,11 @@
	18	@HAVE_PYTHON_TRUE@maintainer-clean-local:
	19	@HAVE_PYTHON_TRUE@ rm -rf "$(srcdir)/fused-src"
	20
	21	-# Disables 'make install' as installing a compiled version of Google
	22	-# Test can lead to undefined behavior due to violation of the
	23	-# One-Definition Rule.
	24	-
	25	install-exec-local:
	26	- echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
	27	- false
	28	+ true
	29
	30	install-data-local:
	31	- echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
	32	- false
	33	+ true
	34
	35	# Tell versions [3.59,3.63) of GNU make to not export all variables.
	36	# Otherwise a system limit (for SysV at least) may be exceeded.

Lines 1-19 Link Here

(-)googletest/files/patch-include_gtest_internal_gtest-port.h (-19 lines)
1	--- include/gtest/internal/gtest-port.h.orig 2010-04-16 06:02:02.000000000 +0800
2	+++ include/gtest/internal/gtest-port.h 2013-10-16 23:39:02.000000000 +0800
3	@@ -173,6 +173,7 @@
4	#include <stdlib.h>
5	#include <stdio.h>
6	#include <string.h>
7	+#include <unistd.h>
8	#ifndef _WIN32_WCE
9	#include <sys/stat.h>
10	#endif // !_WIN32_WCE
11	@@ -399,7 +400,7 @@
12	// defining __GNUC__ and friends, but cannot compile GCC's tuple
13	// implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB
14	// Feature Pack download, which we cannot assume the user has.
15	-#if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \
16	+#if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(_LIBCPP_VERSION) && (GTEST_GCC_VER_ >= 40000)) \
17	\|\| _MSC_VER >= 1600
18	#define GTEST_USE_OWN_TR1_TUPLE 0
19	#else

Line 0 Link Here

(-)googletest/files/patch-port-freebsd (+28 lines)
	1	--- include/gtest/internal/gtest-port.h.orig 2014-08-16 09:30:13.114359210 +0100
	2	+++ include/gtest/internal/gtest-port.h 2014-08-16 09:32:56.496223003 +0100
	3	@@ -92,6 +92,7 @@
	4	// the given platform; otherwise undefined):
	5	// GTEST_OS_AIX - IBM AIX
	6	// GTEST_OS_CYGWIN - Cygwin
	7	+// GTEST_OS_FREEBSD - FreeBSD
	8	// GTEST_OS_HPUX - HP-UX
	9	// GTEST_OS_LINUX - Linux
	10	// GTEST_OS_LINUX_ANDROID - Google Android
	11	@@ -248,6 +249,8 @@
	12	# define GTEST_OS_IOS_SIMULATOR 1
	13	# endif
	14	# endif
	15	+#elif defined __FreeBSD__
	16	+# define GTEST_OS_FREEBSD 1
	17	#elif defined __linux__
	18	# define GTEST_OS_LINUX 1
	19	# if defined __ANDROID__
	20	@@ -646,7 +649,7 @@
	21	(GTEST_OS_MAC && !GTEST_OS_IOS) \|\| GTEST_OS_IOS_SIMULATOR \|\| \
	22	(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) \|\| \
	23	GTEST_OS_WINDOWS_MINGW \|\| GTEST_OS_AIX \|\| GTEST_OS_HPUX \|\| \
	24	- GTEST_OS_OPENBSD \|\| GTEST_OS_QNX)
	25	+ GTEST_OS_FREEBSD \|\| GTEST_OS_OPENBSD \|\| GTEST_OS_QNX)
	26	# define GTEST_HAS_DEATH_TEST 1
	27	# include <vector> // NOLINT
	28	#endif