View | Details | Raw Unified | Return to bug 203514 | Differences between
and this patch

Collapse All | Expand All

(-)googletest/Makefile (-6 / +5 lines)
Lines 14-38 Link Here
14
USE_GITHUB=	yes
14
USE_GITHUB=	yes
15
GH_ACCOUNT=	google
15
GH_ACCOUNT=	google
16
16
17
USES=		autoreconf libtool shebangfix
17
USES=		autoreconf libtool
18
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
19
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
20
INSTALL_TARGET=	install-strip
20
INSTALL_TARGET=	install-strip
21
21
22
CONFIGURE_ENV=	ac_cv_path_PYTHON=python2
23
python_OLD_CMD=	/usr/bin/env python
22
python_OLD_CMD=	/usr/bin/env python
24
python_CMD=	/usr/bin/env python2
25
SHEBANG_FILES=	scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
23
SHEBANG_FILES=	scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
26
		scripts/pump.py
24
		scripts/pump.py
27
25
28
OPTIONS_DEFINE=	TEST
26
OPTIONS_DEFINE=	TEST
29
27
30
TEST_USES=	python:2,build
28
TEST_USES=	python:2,build shebangfix
31
TEST_ALL_TARGET=check
29
TEST_CONFIGURE_ENV=	ac_cv_path_PYTHON="${PYTHON_CMD}"
30
TEST_ALL_TARGET=	check
32
31
33
post-patch:
32
post-patch:
34
# enable vendor make install again (revert 661758e)
33
# enable vendor make install again (revert 661758e)
35
	${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
34
	@${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
36
		${WRKSRC}/Makefile.am
35
		${WRKSRC}/Makefile.am
37
36
38
post-install:
37
post-install:
(-)googlemock/Makefile (-7 / +10 lines)
Lines 18-42 Link Here
18
USE_GITHUB=	yes
18
USE_GITHUB=	yes
19
GH_ACCOUNT=	google
19
GH_ACCOUNT=	google
20
20
21
USES=		autoreconf libtool shebangfix
21
USES=		autoreconf libtool
22
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
23
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
24
INSTALL_TARGET=	install-strip
24
INSTALL_TARGET=	install-strip
25
25
26
CONFIGURE_ENV=	ac_cv_path_PYTHON=python2
27
python_OLD_CMD=	/usr/bin/env python
26
python_OLD_CMD=	/usr/bin/env python
28
python_CMD=	/usr/bin/env python2
29
SHEBANG_FILES=	scripts/fuse_gmock_files.py scripts/gmock_doctor.py
27
SHEBANG_FILES=	scripts/fuse_gmock_files.py scripts/gmock_doctor.py
30
28
31
OPTIONS_DEFINE=	TEST
29
OPTIONS_DEFINE=	TEST
32
30
33
TEST_USES=	python:2,build
31
TEST_USES=		python:2,build shebangfix
34
TEST_ALL_TARGET=check
32
TEST_EXTRACT_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/googletest:patch
33
TEST_ALL_TARGET=	check
34
TEST_CONFIGURE_ENV=	ac_cv_path_PYTHON=${PYTHON_CMD}
35
35
36
post-extract-TEST-on:
37
	@${CP} -R `${MAKE} -C ${PORTSDIR}/devel/googletest -V WRKSRC` ${WRKSRC}/gtest
38
36
post-patch:
39
post-patch:
37
	${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
40
	@${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
38
# enable vendor make install again (revert 52277c9)
41
# enable vendor make install again (revert 52277c9)
39
	${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
42
	@${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
40
		${WRKSRC}/Makefile.am
43
		${WRKSRC}/Makefile.am
41
44
42
post-install:
45
post-install:
(-)googlemock/files/patch-Makefile.am (+10 lines)
Line 0 Link Here
1
--- Makefile.am.orig	2013-09-19 00:32:04 UTC
2
+++ Makefile.am
3
@@ -85,6 +85,7 @@ if HAVE_PYTHON
4
     fused-src/gtest/gtest.h \
5
     test/gmock_test.cc
6
   test_gmock_fused_test_CPPFLAGS = -I"$(srcdir)/fused-src"
7
+  test_gmock_fused_test_LDFLAGS = -lpthread
8
 endif
9
 
10
 # Google Mock source files that we don't compile directly.

Return to bug 203514