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

Collapse All | Expand All

(-)devel/googlemock/Makefile (-6 / +5 lines)
Lines 23-38 GNU_CONFIGURE= yes Link Here
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
26
# fused-src tests are only useful for bundling, testing them before
27
# installing system version is pointless. *.py aren't used during
28
# build/test, so fixing shebang is mainly to help hacking.
29
CONFIGURE_ENV=	ac_cv_path_PYTHON=":"
27
python_OLD_CMD=	/usr/bin/env python
30
python_OLD_CMD=	/usr/bin/env python
28
python_CMD=	/usr/bin/env python2
31
python_CMD=	/usr/bin/env python2
29
SHEBANG_FILES=	scripts/fuse_gmock_files.py scripts/gmock_doctor.py
32
SHEBANG_FILES=	scripts/fuse_gmock_files.py scripts/gmock_doctor.py
33
TEST_TARGET=	check
30
34
31
OPTIONS_DEFINE=	TEST
32
33
TEST_USES=	python:2,build
34
TEST_ALL_TARGET=check
35
36
post-patch:
35
post-patch:
37
	${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
36
	${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
38
# enable vendor make install again (revert 52277c9)
37
# enable vendor make install again (revert 52277c9)
(-)devel/googletest/Makefile (-7 / +6 lines)
Lines 19-38 GNU_CONFIGURE= yes Link Here
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
22
# fused-src tests are only useful for bundling, testing them before
23
# installing system version is pointless. *.py aren't used during
24
# build/test, so fixing shebang is mainly to help hacking.
25
CONFIGURE_ENV=	ac_cv_path_PYTHON=":"
23
python_OLD_CMD=	/usr/bin/env python
26
python_OLD_CMD=	/usr/bin/env python
24
python_CMD=	/usr/bin/env python2
27
python_CMD=	/usr/bin/env python2
25
SHEBANG_FILES=	scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
28
SHEBANG_FILES=	scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \
26
		scripts/pump.py
29
		scripts/pump.py
30
TEST_TARGET=	check
27
31
28
OPTIONS_DEFINE=	TEST
29
30
TEST_USES=	python:2,build
31
TEST_ALL_TARGET=check
32
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:

Return to bug 203514