Attachment 206291 Details for Bug 239654 – Patch to change devel/googletest and devel/googlemock to use CMake

[patch] Patch to change devel/googletest and devel/googlemock to use CMake

patch (text/plain), 10.02 KB, created by Ben Woods on 2019-08-05 11:31:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2019-08-05 11:31:22 UTC

Size: 10.02 KB

patch

obsolete

>Index: devel/googlemock/Makefile
>===================================================================
>--- devel/googlemock/Makefile	(revision 507500)
>+++ devel/googlemock/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	googlemock
> DISTVERSIONPREFIX=	release-
> DISTVERSION=	1.8.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> 
> MAINTAINER=	jbeich@FreeBSD.org
>@@ -21,25 +21,20 @@
> GH_ACCOUNT=	google
> GH_PROJECT=	googletest
> 
>-USES=		autoreconf compiler:c++11-lang libtool localbase python:run shebangfix
>-SHEBANG_FILES=	scripts/gmock_doctor.py
>-WRKSRC_SUBDIR=	${PORTNAME}
>-GNU_CONFIGURE=	yes
>-# fused-src python tests are only useful for bundling. There's no point in
>-# running them before installing system-wide without source files.
>-CONFIGURE_ENV=	ac_cv_path_PYTHON=":"
>+USES=		cmake compiler:c++11-lang libtool localbase python:run shebangfix
>+SHEBANG_FILES=	googlemock/scripts/gmock_doctor.py
> TEST_TARGET=	check
>-INSTALL_TARGET=	install-strip
>+STRIP=		yes
> USE_LDCONFIG=	yes
>+CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON \
>+		-DBUILD_GMOCK:BOOL=ON
> 
>-post-patch:
>-	@${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
>-# enable vendor make install again (revert 52277c9)
>-	@${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
>-		${WRKSRC}/Makefile.am
>-
> post-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin
>+	find "${STAGEDIR}" -name '*.pump' -print0 | xargs -0 rm -v
>+	${INSTALL_SCRIPT} ${WRKSRC}/googlemock/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin
>+	${RM} -r ${STAGEDIR}${PREFIX}/include/gtest \
>+		${STAGEDIR}${PREFIX}/lib/cmake \
>+		${STAGEDIR}${PREFIX}/lib/libgtest* \
>+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/gtest*
> 
> .include <bsd.port.mk>
>Index: devel/googlemock/files/patch-Makefile.am
>===================================================================
>--- devel/googlemock/files/patch-Makefile.am	(revision 507500)
>+++ devel/googlemock/files/patch-Makefile.am	(nonexistent)
>@@ -1,16 +0,0 @@
>-Move custom headers into their own directory
>-
>---- Makefile.am.orig	2016-11-03 20:36:28 UTC
>-+++ Makefile.am
>-@@ -42,7 +42,10 @@ pkginclude_internaldir = $(pkgincludedir
>- pkginclude_internal_HEADERS = \
>-   include/gmock/internal/gmock-generated-internal-utils.h \
>-   include/gmock/internal/gmock-internal-utils.h \
>--  include/gmock/internal/gmock-port.h \
>-+  include/gmock/internal/gmock-port.h
>-+
>-+pkginclude_internal_customdir = $(pkgincludedir)/internal/custom
>-+pkginclude_internal_custom_HEADERS = \
>-   include/gmock/internal/custom/gmock-generated-actions.h \
>-   include/gmock/internal/custom/gmock-matchers.h \
>-   include/gmock/internal/custom/gmock-port.h
>
>Property changes on: devel/googlemock/files/patch-Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/googlemock/pkg-plist
>===================================================================
>--- devel/googlemock/pkg-plist	(revision 507500)
>+++ devel/googlemock/pkg-plist	(working copy)
>@@ -1,4 +1,3 @@
>-bin/gmock-config
> bin/gmock_doctor.py
> include/gmock/gmock-actions.h
> include/gmock/gmock-cardinalities.h
>@@ -11,6 +10,7 @@
> include/gmock/gmock-more-matchers.h
> include/gmock/gmock-spec-builders.h
> include/gmock/gmock.h
>+include/gmock/internal/custom/README.md
> include/gmock/internal/custom/gmock-generated-actions.h
> include/gmock/internal/custom/gmock-matchers.h
> include/gmock/internal/custom/gmock-port.h
>@@ -17,11 +17,7 @@
> include/gmock/internal/gmock-generated-internal-utils.h
> include/gmock/internal/gmock-internal-utils.h
> include/gmock/internal/gmock-port.h
>-lib/libgmock.a
> lib/libgmock.so
>-lib/libgmock.so.0
>-lib/libgmock.so.0.0.0
>-lib/libgmock_main.a
> lib/libgmock_main.so
>-lib/libgmock_main.so.0
>-lib/libgmock_main.so.0.0.0
>+libdata/pkgconfig/gmock.pc
>+libdata/pkgconfig/gmock_main.pc
>Index: devel/googletest/Makefile
>===================================================================
>--- devel/googletest/Makefile	(revision 507500)
>+++ devel/googletest/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	googletest
> DISTVERSIONPREFIX=	release-
> DISTVERSION=	1.8.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	devel
> 
> MAINTAINER=	jbeich@FreeBSD.org
>@@ -16,28 +16,15 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	google
> 
>-USES=		autoreconf compiler:c++11-lang libtool
>-WRKSRC_SUBDIR=	${PORTNAME}
>-GNU_CONFIGURE=	yes
>-# fused-src python tests are only useful for bundling. There's no point in
>-# running them before installing system-wide without source files.
>-CONFIGURE_ENV=	ac_cv_path_PYTHON=":"
>+USES=		cmake compiler:c++11-lang libtool
> TEST_TARGET=	check
>-INSTALL_TARGET=	install-strip
>+STRIP=		yes
> USE_LDCONFIG=	yes
>+CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON \
>+		-DBUILD_GMOCK:BOOL=OFF
> 
>-# googletest requires pthread in order to function and does not properly
>-# detect pthread support.
>-#
>-# See: https://github.com/google/googletest/issues/2162
>-LIBS+=		-lpthread
>-
>-post-patch:
>-# enable vendor make install again (revert 661758e)
>-	@${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
>-		${WRKSRC}/Makefile.am
>-
> post-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin
>+	find "${STAGEDIR}" -name '*.pump' -print0 | xargs -0 rm -v
>+	${INSTALL_DATA} ${WRKSRC}/googletest/m4/gtest.m4 ${STAGEDIR}${PREFIX}/share/aclocal
> 
> .include <bsd.port.mk>
>Index: devel/googletest/files/patch-Makefile.am
>===================================================================
>--- devel/googletest/files/patch-Makefile.am	(revision 507500)
>+++ devel/googletest/files/patch-Makefile.am	(nonexistent)
>@@ -1,16 +0,0 @@
>-Move custom headers into their own directory
>-
>---- Makefile.am.orig	2017-09-23 23:21:02 UTC
>-+++ Makefile.am
>-@@ -208,7 +208,10 @@ pkginclude_internal_HEADERS = \
>-   include/gtest/internal/gtest-port-arch.h \
>-   include/gtest/internal/gtest-string.h \
>-   include/gtest/internal/gtest-tuple.h \
>--  include/gtest/internal/gtest-type-util.h \
>-+  include/gtest/internal/gtest-type-util.h
>-+
>-+pkginclude_internal_customdir = $(pkgincludedir)/internal/custom
>-+pkginclude_internal_custom_HEADERS = \
>-   include/gtest/internal/custom/gtest.h \
>-   include/gtest/internal/custom/gtest-port.h \
>-   include/gtest/internal/custom/gtest-printers.h
>
>Property changes on: devel/googletest/files/patch-Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/googletest/files/patch-bsd-defines
>===================================================================
>--- devel/googletest/files/patch-bsd-defines	(revision 507500)
>+++ devel/googletest/files/patch-bsd-defines	(working copy)
>@@ -1,8 +1,8 @@
> o Add DragonFly and GNU/kFreeBSD support
> o Implement GetThreadCount() for BSDs
> 
>---- include/gtest/internal/gtest-port-arch.h.orig	2017-09-23 23:21:02 UTC
>-+++ include/gtest/internal/gtest-port-arch.h
>+--- googletest/include/gtest/internal/gtest-port-arch.h.orig	2017-09-23 23:21:02 UTC
>++++ googletest/include/gtest/internal/gtest-port-arch.h
> @@ -67,6 +67,10 @@
>  # if TARGET_OS_IPHONE
>  #  define GTEST_OS_IOS 1
>@@ -14,8 +14,8 @@
>  #elif defined __FreeBSD__
>  # define GTEST_OS_FREEBSD 1
>  #elif defined __Fuchsia__
>---- include/gtest/internal/gtest-port.h.orig	2018-08-31 15:21:57 UTC
>-+++ include/gtest/internal/gtest-port.h
>+--- googletest/include/gtest/internal/gtest-port.h.orig	2018-08-31 15:21:57 UTC
>++++ googletest/include/gtest/internal/gtest-port.h
> @@ -125,7 +125,9 @@
>  //
>  //   GTEST_OS_AIX      - IBM AIX
>@@ -54,8 +54,8 @@
>  # define GTEST_CAN_STREAM_RESULTS_ 1
>  #endif
>  
>---- src/gtest-port.cc.orig	2017-09-23 23:21:02 UTC
>-+++ src/gtest-port.cc
>+--- googletest/src/gtest-port.cc.orig	2017-09-23 23:21:02 UTC
>++++ googletest/src/gtest-port.cc
> @@ -52,6 +52,14 @@
>  # include <mach/vm_map.h>
>  #endif  // GTEST_OS_MAC
>@@ -152,8 +152,8 @@
>  #elif GTEST_OS_QNX
>  
>  // Returns the number of threads running in the process, or 0 to indicate that
>---- src/gtest.cc.orig	2017-09-23 23:21:02 UTC
>-+++ src/gtest.cc
>+--- googletest/src/gtest.cc.orig	2017-09-23 23:21:02 UTC
>++++ googletest/src/gtest.cc
> @@ -127,7 +127,7 @@
>  #endif
>  
>@@ -163,8 +163,8 @@
>  # include <netdb.h>  // NOLINT
>  # include <sys/socket.h>  // NOLINT
>  # include <sys/types.h>  // NOLINT
>---- test/googletest-port-test.cc.orig	2018-08-31 15:21:57 UTC
>-+++ test/googletest-port-test.cc
>+--- googletest/test/googletest-port-test.cc.orig	2018-08-31 15:21:57 UTC
>++++ googletest/test/googletest-port-test.cc
> @@ -293,7 +293,9 @@ TEST(FormatCompilerIndependentFileLocationTest, Format
>    EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1));
>  }
>Index: devel/googletest/pkg-plist
>===================================================================
>--- devel/googletest/pkg-plist	(revision 507500)
>+++ devel/googletest/pkg-plist	(working copy)
>@@ -1,4 +1,3 @@
>-bin/gtest-config
> include/gtest/gtest-death-test.h
> include/gtest/gtest-message.h
> include/gtest/gtest-param-test.h
>@@ -9,6 +8,7 @@
> include/gtest/gtest.h
> include/gtest/gtest_pred_impl.h
> include/gtest/gtest_prod.h
>+include/gtest/internal/custom/README.md
> include/gtest/internal/custom/gtest-port.h
> include/gtest/internal/custom/gtest-printers.h
> include/gtest/internal/custom/gtest.h
>@@ -23,12 +23,12 @@
> include/gtest/internal/gtest-string.h
> include/gtest/internal/gtest-tuple.h
> include/gtest/internal/gtest-type-util.h
>-lib/libgtest.a
>+lib/cmake/GTest/GTestConfig.cmake
>+lib/cmake/GTest/GTestConfigVersion.cmake
>+lib/cmake/GTest/GTestTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/GTest/GTestTargets.cmake
> 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
>+libdata/pkgconfig/gtest.pc
>+libdata/pkgconfig/gtest_main.pc
> share/aclocal/gtest.m4

Flags:

jbeich: maintainer-approval-

Actions: View | Diff

Attachments on bug 239654: 206291