Attachment 145880 Details for Bug 187562 – Update port to 1.7.0

[patch] Update port to 1.7.0

googletest-1.7.0.patch (text/plain), 5.54 KB, created by Roger Leigh on 2014-08-16 20:24:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roger Leigh

Created: 2014-08-16 20:24:41 UTC

Size: 5.54 KB

patch

obsolete

>diff -urN googletest.old/Makefile googletest/Makefile
>--- googletest.old/Makefile	2014-06-16 23:21:25.000000000 +0100
>+++ googletest/Makefile	2014-08-15 23:43:44.759229307 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/googletest/Makefile 358056 2014-06-16 22:21:25Z amdmi3 $
> 
> PORTNAME=	googletest
>-PORTVERSION=	1.5.0
>+PORTVERSION=	1.7.0
> PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	GOOGLE_CODE
>@@ -11,7 +11,7 @@
> MAINTAINER=	clsung@FreeBSD.org
> COMMENT=	Framework for writing C++ tests on a variety of platforms
> 
>-USES=		shebangfix libtool
>+USES=		zip libtool
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> USE_PYTHON_BUILD=	2
>diff -urN googletest.old/distinfo googletest/distinfo
>--- googletest.old/distinfo	2014-01-22 15:30:13.000000000 +0000
>+++ googletest/distinfo	2014-08-15 23:29:04.601291899 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff
>-SIZE (gtest-1.5.0.tar.gz) = 896874
>+SHA256 (gtest-1.7.0.zip) = 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d
>+SIZE (gtest-1.7.0.zip) = 1164254
>diff -urN googletest.old/files/patch-allow-install googletest/files/patch-allow-install
>--- googletest.old/files/patch-allow-install	1970-01-01 01:00:00.000000000 +0100
>+++ googletest/files/patch-allow-install	2014-08-15 23:58:31.515238108 +0100
>@@ -0,0 +1,36 @@
>+--- 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.
>diff -urN googletest.old/files/patch-include_gtest_internal_gtest-port.h googletest/files/patch-include_gtest_internal_gtest-port.h
>--- googletest.old/files/patch-include_gtest_internal_gtest-port.h	2013-11-07 02:52:10.000000000 +0000
>+++ googletest/files/patch-include_gtest_internal_gtest-port.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,19 +0,0 @@
>---- 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
>diff -urN googletest.old/files/patch-port-freebsd googletest/files/patch-port-freebsd
>--- googletest.old/files/patch-port-freebsd	1970-01-01 01:00:00.000000000 +0100
>+++ googletest/files/patch-port-freebsd	2014-08-16 09:33:48.796317752 +0100
>@@ -0,0 +1,28 @@
>+--- 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
>diff -urN googletest.old/pkg-plist googletest/pkg-plist
>--- googletest.old/pkg-plist	2014-06-16 23:21:25.000000000 +0100
>+++ googletest/pkg-plist	2014-08-16 00:04:50.982147632 +0100
>@@ -1,7 +1,7 @@
>-bin/gtest-config
> include/gtest/gtest-death-test.h
> include/gtest/gtest-message.h
> include/gtest/gtest-param-test.h
>+include/gtest/gtest-printers.h
> include/gtest/gtest-spi.h
> include/gtest/gtest-test-part.h
> include/gtest/gtest-typed-test.h

Actions: View | Diff

Attachments on bug 187562: 140844 | 144798 | 145880 | 148803 | 148804 | 148805 | 148806 | 148807 | 148808 | 149345 | 149822 | 149823 | 149824