Attachment 149345 Details for Bug 187562 – diff: update using CMake

[patch] diff: update using CMake

devel-googletest.diff (text/plain), 4.51 KB, created by Pedro F. Giffuni on 2014-11-13 00:29:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2014-11-13 00:29:08 UTC

Size: 4.51 KB

patch

obsolete

>Index: devel/googletest/Makefile
>===================================================================
>--- devel/googletest/Makefile	(revision 372449)
>+++ devel/googletest/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	googletest
>-PORTVERSION=	1.5.0
>-PORTREVISION=	1
>+PORTVERSION=	1.7.0
> CATEGORIES=	devel
> MASTER_SITES=	GOOGLE_CODE
> DISTNAME=	gtest-${PORTVERSION}
>@@ -13,16 +12,19 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-USES=		libtool python:2,build shebangfix
>-GNU_CONFIGURE=	yes
>-USE_LDCONFIG=	yes
>+USES=		cmake python:2,build shebangfix zip
>+#CMAKE_ARGS+=	-Dgtest_build_samples=ON
> 
> python_OLD_CMD=	/usr/bin/env python
> python_CMD=	/usr/bin/env python2
> SHEBANG_FILES=	scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
> 		scripts/pump.py
>+do-install:
>+	${MKDIR} ${STAGEDIR}${LOCALBASE}/lib
>+	${INSTALL_DATA} ${WRKSRC}/libgtest* ${STAGEDIR}${LOCALBASE}/lib
>+	${MKDIR} ${STAGEDIR}${LOCALBASE}/include
>+	(cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${LOCALBASE}/include)
>+	${RM} ${STAGEDIR}${LOCALBASE}/include/gtest/*.pump \
>+	${STAGEDIR}${LOCALBASE}/include/gtest/internal/*.pump
> 
>-regression-test:
>-	cd ${WRKSRC}; ${MAKE} check
>-
> .include <bsd.port.mk>
>Index: devel/googletest/distinfo
>===================================================================
>--- devel/googletest/distinfo	(revision 372449)
>+++ devel/googletest/distinfo	(working copy)
>@@ -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
>Index: devel/googletest/files/patch-include_gtest_internal_gtest-port.h
>===================================================================
>--- devel/googletest/files/patch-include_gtest_internal_gtest-port.h	(revision 372449)
>+++ devel/googletest/files/patch-include_gtest_internal_gtest-port.h	(working copy)
>@@ -1,19 +1,28 @@
>---- 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
>Index: devel/googletest/pkg-plist
>===================================================================
>--- devel/googletest/pkg-plist	(revision 372449)
>+++ devel/googletest/pkg-plist	(working copy)
>@@ -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
>@@ -19,11 +19,4 @@
> include/gtest/internal/gtest-tuple.h
> include/gtest/internal/gtest-type-util.h
> lib/libgtest.a
>-lib/libgtest.so
>-lib/libgtest.so.0
>-lib/libgtest.so.0.0.0
> lib/libgtest_main.a
>-lib/libgtest_main.so
>-lib/libgtest_main.so.0
>-lib/libgtest_main.so.0.0.0
>-share/aclocal/gtest.m4

Actions: View | Diff

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