Attachment 161659 Details for Bug 203514 – Patch

[patch] Patch

googlemock.patch (text/plain), 2.79 KB, created by Dmitry Marakasov on 2015-10-02 21:05:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-10-02 21:05:16 UTC

Size: 2.79 KB

patch

obsolete

>Index: googletest/Makefile
>===================================================================
>--- googletest/Makefile	(revision 398431)
>+++ googletest/Makefile	(working copy)
>@@ -14,25 +14,24 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	google
> 
>-USES=		autoreconf libtool shebangfix
>+USES=		autoreconf libtool
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
> 
>-CONFIGURE_ENV=	ac_cv_path_PYTHON=python2
> 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
> 
> OPTIONS_DEFINE=	TEST
> 
>-TEST_USES=	python:2,build
>-TEST_ALL_TARGET=check
>+TEST_USES=	python:2,build shebangfix
>+TEST_CONFIGURE_ENV=	ac_cv_path_PYTHON="${PYTHON_CMD}"
>+TEST_ALL_TARGET=	check
> 
> post-patch:
> # enable vendor make install again (revert 661758e)
>-	${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
>+	@${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
> 		${WRKSRC}/Makefile.am
> 
> post-install:
>Index: googlemock/Makefile
>===================================================================
>--- googlemock/Makefile	(revision 398431)
>+++ googlemock/Makefile	(working copy)
>@@ -18,25 +18,28 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	google
> 
>-USES=		autoreconf libtool shebangfix
>+USES=		autoreconf libtool
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
> 
>-CONFIGURE_ENV=	ac_cv_path_PYTHON=python2
> python_OLD_CMD=	/usr/bin/env python
>-python_CMD=	/usr/bin/env python2
> SHEBANG_FILES=	scripts/fuse_gmock_files.py scripts/gmock_doctor.py
> 
> OPTIONS_DEFINE=	TEST
> 
>-TEST_USES=	python:2,build
>-TEST_ALL_TARGET=check
>+TEST_USES=		python:2,build shebangfix
>+TEST_EXTRACT_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/googletest:patch
>+TEST_ALL_TARGET=	check
>+TEST_CONFIGURE_ENV=	ac_cv_path_PYTHON=${PYTHON_CMD}
> 
>+post-extract-TEST-on:
>+	@${CP} -R `${MAKE} -C ${PORTSDIR}/devel/googletest -V WRKSRC` ${WRKSRC}/gtest
>+
> post-patch:
>-	${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
>+	@${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/' \
>+	@${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
> 		${WRKSRC}/Makefile.am
> 
> post-install:
>Index: googlemock/files/patch-Makefile.am
>===================================================================
>--- googlemock/files/patch-Makefile.am	(revision 0)
>+++ googlemock/files/patch-Makefile.am	(working copy)
>@@ -0,0 +1,10 @@
>+--- Makefile.am.orig	2013-09-19 00:32:04 UTC
>++++ Makefile.am
>+@@ -85,6 +85,7 @@ if HAVE_PYTHON
>+     fused-src/gtest/gtest.h \
>+     test/gmock_test.cc
>+   test_gmock_fused_test_CPPFLAGS = -I"$(srcdir)/fused-src"
>++  test_gmock_fused_test_LDFLAGS = -lpthread
>+ endif
>+ 
>+ # Google Mock source files that we don't compile directly.

Flags:

amdmi3: maintainer-approval? (jbeich)

Actions: View | Diff

Attachments on bug 203514: 161659 | 161664