Attachment #206291 for bug #239654

View | Details | Raw Unified | Return to bug 239654
Collapse All | Expand All




PORTNAME=	googlemock
DISTVERSIONPREFIX=	release-
DISTVERSION=	1.8.1
PORTREVISION=	3
CATEGORIES=	devel

MAINTAINER=	jbeich@FreeBSD.org

GH_ACCOUNT=	google
GH_PROJECT=	googletest

USES=		cmake compiler:c++11-lang libtool localbase python:run shebangfix
SHEBANG_FILES=	googlemock/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=":"
TEST_TARGET=	check
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:
	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>




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




bin/gmock-config
bin/gmock_doctor.py
include/gmock/gmock-actions.h
include/gmock/gmock-cardinalities.h

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

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
libdata/pkgconfig/gmock.pc
libdata/pkgconfig/gmock_main.pc




PORTNAME=	googletest
DISTVERSIONPREFIX=	release-
DISTVERSION=	1.8.1
PORTREVISION=	4
CATEGORIES=	devel

MAINTAINER=	jbeich@FreeBSD.org

USE_GITHUB=	yes
GH_ACCOUNT=	google

USES=		cmake 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=":"
TEST_TARGET=	check
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:
	find "${STAGEDIR}" -name '*.pump' -print0 | xargs -0 rm -v
	${INSTALL_DATA} ${WRKSRC}/googletest/m4/gtest.m4 ${STAGEDIR}${PREFIX}/share/aclocal

.include <bsd.port.mk>




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




o Add DragonFly and GNU/kFreeBSD support
o Implement GetThreadCount() for BSDs

--- 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

 #elif defined __FreeBSD__
 # define GTEST_OS_FREEBSD 1
 #elif defined __Fuchsia__
--- 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

 # define GTEST_CAN_STREAM_RESULTS_ 1
 #endif
 
--- 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

 #elif GTEST_OS_QNX
 
 // Returns the number of threads running in the process, or 0 to indicate that
--- googletest/src/gtest.cc.orig	2017-09-23 23:21:02 UTC
+++ googletest/src/gtest.cc
@@ -127,7 +127,7 @@
 #endif
 

 # include <netdb.h>  // NOLINT
 # include <sys/socket.h>  // NOLINT
 # include <sys/types.h>  // NOLINT
--- 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));
 }

Lines 1-4 Link Here

(-)devel/googletest/pkg-plist (-7 / +7 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
Lines 9-14 Link Here
9	include/gtest/gtest.h	8	include/gtest/gtest.h
10	include/gtest/gtest_pred_impl.h	9	include/gtest/gtest_pred_impl.h
11	include/gtest/gtest_prod.h	10	include/gtest/gtest_prod.h
		11	include/gtest/internal/custom/README.md
12	include/gtest/internal/custom/gtest-port.h	12	include/gtest/internal/custom/gtest-port.h
13	include/gtest/internal/custom/gtest-printers.h	13	include/gtest/internal/custom/gtest-printers.h
14	include/gtest/internal/custom/gtest.h	14	include/gtest/internal/custom/gtest.h
Lines 23-34 Link Here
23	include/gtest/internal/gtest-string.h	23	include/gtest/internal/gtest-string.h
24	include/gtest/internal/gtest-tuple.h	24	include/gtest/internal/gtest-tuple.h
25	include/gtest/internal/gtest-type-util.h	25	include/gtest/internal/gtest-type-util.h
26	lib/libgtest.a	26	lib/cmake/GTest/GTestConfig.cmake
		27	lib/cmake/GTest/GTestConfigVersion.cmake
		28	lib/cmake/GTest/GTestTargets-%%CMAKE_BUILD_TYPE%%.cmake
		29	lib/cmake/GTest/GTestTargets.cmake
27	lib/libgtest.so	30	lib/libgtest.so
28	lib/libgtest.so.0
29	lib/libgtest.so.0.0.0
30	lib/libgtest_main.a
31	lib/libgtest_main.so	31	lib/libgtest_main.so
32	lib/libgtest_main.so.0	32	libdata/pkgconfig/gtest.pc
33	lib/libgtest_main.so.0.0.0	33	libdata/pkgconfig/gtest_main.pc
34	share/aclocal/gtest.m4	34	share/aclocal/gtest.m4

Return to bug 239654

Lines 4-10 Link Here

(-)devel/googlemock/Makefile (-17 / +12 lines)
4	PORTNAME= googlemock	4	PORTNAME= googlemock
5	DISTVERSIONPREFIX= release-	5	DISTVERSIONPREFIX= release-
6	DISTVERSION= 1.8.1	6	DISTVERSION= 1.8.1
7	PORTREVISION= 2	7	PORTREVISION= 3
8	CATEGORIES= devel	8	CATEGORIES= devel
9		9
10	MAINTAINER= jbeich@FreeBSD.org	10	MAINTAINER= jbeich@FreeBSD.org
Lines 21-45 Link Here
21	GH_ACCOUNT= google	21	GH_ACCOUNT= google
22	GH_PROJECT= googletest	22	GH_PROJECT= googletest
23		23
24	USES= autoreconf compiler:c++11-lang libtool localbase python:run shebangfix	24	USES= cmake compiler:c++11-lang libtool localbase python:run shebangfix
25	SHEBANG_FILES= scripts/gmock_doctor.py	25	SHEBANG_FILES= googlemock/scripts/gmock_doctor.py
26	WRKSRC_SUBDIR= ${PORTNAME}
27	GNU_CONFIGURE= yes
28	# fused-src python tests are only useful for bundling. There's no point in
29	# running them before installing system-wide without source files.
30	CONFIGURE_ENV= ac_cv_path_PYTHON=":"
31	TEST_TARGET= check	26	TEST_TARGET= check
32	INSTALL_TARGET= install-strip	27	STRIP= yes
33	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
		29	CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \
		30	-DBUILD_GMOCK:BOOL=ON
34		31
35	post-patch:
36	@${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
37	# enable vendor make install again (revert 52277c9)
38	@${REINPLACE_CMD} -E 's/install-(exec\|data)-local/&-dummy/' \
39	${WRKSRC}/Makefile.am
40
41	post-install:	32	post-install:
42	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${STAGEDIR}${PREFIX}/bin	33	find "${STAGEDIR}" -name '*.pump' -print0 \| xargs -0 rm -v
43	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin	34	${INSTALL_SCRIPT} ${WRKSRC}/googlemock/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin
		35	${RM} -r ${STAGEDIR}${PREFIX}/include/gtest \
		36	${STAGEDIR}${PREFIX}/lib/cmake \
		37	${STAGEDIR}${PREFIX}/lib/libgtest* \
		38	${STAGEDIR}${PREFIX}/libdata/pkgconfig/gtest*
44		39
45	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)devel/googlemock/files/patch-Makefile.am (-16 lines)
1	Move custom headers into their own directory
2
3	--- Makefile.am.orig 2016-11-03 20:36:28 UTC
4	+++ Makefile.am
5	@@ -42,7 +42,10 @@ pkginclude_internaldir = $(pkgincludedir
6	pkginclude_internal_HEADERS = \
7	include/gmock/internal/gmock-generated-internal-utils.h \
8	include/gmock/internal/gmock-internal-utils.h \
9	- include/gmock/internal/gmock-port.h \
10	+ include/gmock/internal/gmock-port.h
11	+
12	+pkginclude_internal_customdir = $(pkgincludedir)/internal/custom
13	+pkginclude_internal_custom_HEADERS = \
14	include/gmock/internal/custom/gmock-generated-actions.h \
15	include/gmock/internal/custom/gmock-matchers.h \
16	include/gmock/internal/custom/gmock-port.h

Lines 1-4 Link Here

(-)devel/googlemock/pkg-plist (-7 / +3 lines)
1	bin/gmock-config
2	bin/gmock_doctor.py	1	bin/gmock_doctor.py
3	include/gmock/gmock-actions.h	2	include/gmock/gmock-actions.h
4	include/gmock/gmock-cardinalities.h	3	include/gmock/gmock-cardinalities.h
Lines 11-16 Link Here
11	include/gmock/gmock-more-matchers.h	10	include/gmock/gmock-more-matchers.h
12	include/gmock/gmock-spec-builders.h	11	include/gmock/gmock-spec-builders.h
13	include/gmock/gmock.h	12	include/gmock/gmock.h
		13	include/gmock/internal/custom/README.md
14	include/gmock/internal/custom/gmock-generated-actions.h	14	include/gmock/internal/custom/gmock-generated-actions.h
15	include/gmock/internal/custom/gmock-matchers.h	15	include/gmock/internal/custom/gmock-matchers.h
16	include/gmock/internal/custom/gmock-port.h	16	include/gmock/internal/custom/gmock-port.h
Lines 17-27 Link Here
17	include/gmock/internal/gmock-generated-internal-utils.h	17	include/gmock/internal/gmock-generated-internal-utils.h
18	include/gmock/internal/gmock-internal-utils.h	18	include/gmock/internal/gmock-internal-utils.h
19	include/gmock/internal/gmock-port.h	19	include/gmock/internal/gmock-port.h
20	lib/libgmock.a
21	lib/libgmock.so	20	lib/libgmock.so
22	lib/libgmock.so.0
23	lib/libgmock.so.0.0.0
24	lib/libgmock_main.a
25	lib/libgmock_main.so	21	lib/libgmock_main.so
26	lib/libgmock_main.so.0	22	libdata/pkgconfig/gmock.pc
27	lib/libgmock_main.so.0.0.0	23	libdata/pkgconfig/gmock_main.pc

Lines 4-10 Link Here

(-)devel/googletest/Makefile (-20 / +7 lines)
4	PORTNAME= googletest	4	PORTNAME= googletest
5	DISTVERSIONPREFIX= release-	5	DISTVERSIONPREFIX= release-
6	DISTVERSION= 1.8.1	6	DISTVERSION= 1.8.1
7	PORTREVISION= 3	7	PORTREVISION= 4
8	CATEGORIES= devel	8	CATEGORIES= devel
9		9
10	MAINTAINER= jbeich@FreeBSD.org	10	MAINTAINER= jbeich@FreeBSD.org
Lines 16-43 Link Here
16	USE_GITHUB= yes	16	USE_GITHUB= yes
17	GH_ACCOUNT= google	17	GH_ACCOUNT= google
18		18
19	USES= autoreconf compiler:c++11-lang libtool	19	USES= cmake compiler:c++11-lang libtool
20	WRKSRC_SUBDIR= ${PORTNAME}
21	GNU_CONFIGURE= yes
22	# fused-src python tests are only useful for bundling. There's no point in
23	# running them before installing system-wide without source files.
24	CONFIGURE_ENV= ac_cv_path_PYTHON=":"
25	TEST_TARGET= check	20	TEST_TARGET= check
26	INSTALL_TARGET= install-strip	21	STRIP= yes
27	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
		23	CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \
		24	-DBUILD_GMOCK:BOOL=OFF
28		25
29	# googletest requires pthread in order to function and does not properly
30	# detect pthread support.
31	#
32	# See: https://github.com/google/googletest/issues/2162
33	LIBS+= -lpthread
34
35	post-patch:
36	# enable vendor make install again (revert 661758e)
37	@${REINPLACE_CMD} -E 's/install-(exec\|data)-local/&-dummy/' \
38	${WRKSRC}/Makefile.am
39
40	post-install:	26	post-install:
41	${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin	27	find "${STAGEDIR}" -name '*.pump' -print0 \| xargs -0 rm -v
		28	${INSTALL_DATA} ${WRKSRC}/googletest/m4/gtest.m4 ${STAGEDIR}${PREFIX}/share/aclocal
42		29
43	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)devel/googletest/files/patch-Makefile.am (-16 lines)
1	Move custom headers into their own directory
2
3	--- Makefile.am.orig 2017-09-23 23:21:02 UTC
4	+++ Makefile.am
5	@@ -208,7 +208,10 @@ pkginclude_internal_HEADERS = \
6	include/gtest/internal/gtest-port-arch.h \
7	include/gtest/internal/gtest-string.h \
8	include/gtest/internal/gtest-tuple.h \
9	- include/gtest/internal/gtest-type-util.h \
10	+ include/gtest/internal/gtest-type-util.h
11	+
12	+pkginclude_internal_customdir = $(pkgincludedir)/internal/custom
13	+pkginclude_internal_custom_HEADERS = \
14	include/gtest/internal/custom/gtest.h \
15	include/gtest/internal/custom/gtest-port.h \
16	include/gtest/internal/custom/gtest-printers.h

Lines 1-8 Link Here

(-)devel/googletest/files/patch-bsd-defines (-10 / +10 lines)
1	o Add DragonFly and GNU/kFreeBSD support	1	o Add DragonFly and GNU/kFreeBSD support
2	o Implement GetThreadCount() for BSDs	2	o Implement GetThreadCount() for BSDs
3		3
4	--- include/gtest/internal/gtest-port-arch.h.orig 2017-09-23 23:21:02 UTC	4	--- googletest/include/gtest/internal/gtest-port-arch.h.orig 2017-09-23 23:21:02 UTC
5	+++ include/gtest/internal/gtest-port-arch.h	5	+++ googletest/include/gtest/internal/gtest-port-arch.h
6	@@ -67,6 +67,10 @@	6	@@ -67,6 +67,10 @@
7	# if TARGET_OS_IPHONE	7	# if TARGET_OS_IPHONE
8	# define GTEST_OS_IOS 1	8	# define GTEST_OS_IOS 1
Lines 14-21 Link Here
14	#elif defined __FreeBSD__	14	#elif defined __FreeBSD__
15	# define GTEST_OS_FREEBSD 1	15	# define GTEST_OS_FREEBSD 1
16	#elif defined __Fuchsia__	16	#elif defined __Fuchsia__
17	--- include/gtest/internal/gtest-port.h.orig 2018-08-31 15:21:57 UTC	17	--- googletest/include/gtest/internal/gtest-port.h.orig 2018-08-31 15:21:57 UTC
18	+++ include/gtest/internal/gtest-port.h	18	+++ googletest/include/gtest/internal/gtest-port.h
19	@@ -125,7 +125,9 @@	19	@@ -125,7 +125,9 @@
20	//	20	//
21	// GTEST_OS_AIX - IBM AIX	21	// GTEST_OS_AIX - IBM AIX
Lines 54-61 Link Here
54	# define GTEST_CAN_STREAM_RESULTS_ 1	54	# define GTEST_CAN_STREAM_RESULTS_ 1
55	#endif	55	#endif
56		56
57	--- src/gtest-port.cc.orig 2017-09-23 23:21:02 UTC	57	--- googletest/src/gtest-port.cc.orig 2017-09-23 23:21:02 UTC
58	+++ src/gtest-port.cc	58	+++ googletest/src/gtest-port.cc
59	@@ -52,6 +52,14 @@	59	@@ -52,6 +52,14 @@
60	# include <mach/vm_map.h>	60	# include <mach/vm_map.h>
61	#endif // GTEST_OS_MAC	61	#endif // GTEST_OS_MAC
Lines 152-159 Link Here
152	#elif GTEST_OS_QNX	152	#elif GTEST_OS_QNX
153		153
154	// Returns the number of threads running in the process, or 0 to indicate that	154	// Returns the number of threads running in the process, or 0 to indicate that
155	--- src/gtest.cc.orig 2017-09-23 23:21:02 UTC	155	--- googletest/src/gtest.cc.orig 2017-09-23 23:21:02 UTC
156	+++ src/gtest.cc	156	+++ googletest/src/gtest.cc
157	@@ -127,7 +127,7 @@	157	@@ -127,7 +127,7 @@
158	#endif	158	#endif
159		159
Lines 163-170 Link Here
163	# include <netdb.h> // NOLINT	163	# include <netdb.h> // NOLINT
164	# include <sys/socket.h> // NOLINT	164	# include <sys/socket.h> // NOLINT
165	# include <sys/types.h> // NOLINT	165	# include <sys/types.h> // NOLINT
166	--- test/googletest-port-test.cc.orig 2018-08-31 15:21:57 UTC	166	--- googletest/test/googletest-port-test.cc.orig 2018-08-31 15:21:57 UTC
167	+++ test/googletest-port-test.cc	167	+++ googletest/test/googletest-port-test.cc
168	@@ -293,7 +293,9 @@ TEST(FormatCompilerIndependentFileLocationTest, Format	168	@@ -293,7 +293,9 @@ TEST(FormatCompilerIndependentFileLocationTest, Format
169	EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1));	169	EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1));
170	}	170	}