Attachment #184864 for bug #221114

Lines 39-44 Link Here

(-)bazel/Makefile (-1 / +7 lines)
39	CLANG38_BUILD_DEPENDS= clang38:devel/llvm38	39	CLANG38_BUILD_DEPENDS= clang38:devel/llvm38
40	CLANG38_RUN_DEPENDS= clang38:devel/llvm38	40	CLANG38_RUN_DEPENDS= clang38:devel/llvm38
41		41
		42	.include <bsd.port.pre.mk>
		43
		44	.if ${ARCH} == "i386"
		45	EXTRA_PATCHES += ${FILESDIR}/extra-i386_src_BUILD
		46	.endif
		47
42	# Have the location of the system-wide rc file reside ${ETCDIR}.	48	# Have the location of the system-wide rc file reside ${ETCDIR}.
43	# Also adapt the sample file to disable persistent java workers as they	49	# Also adapt the sample file to disable persistent java workers as they
44	# do not work reliably on FreeBSD.	50	# do not work reliably on FreeBSD.
Lines 71-74 Link Here
71	@${MKDIR} ${STAGEDIR}${ETCDIR}	77	@${MKDIR} ${STAGEDIR}${ETCDIR}
72	${INSTALL_DATA} ${WRKSRC}/scripts/packages/debian/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample	78	${INSTALL_DATA} ${WRKSRC}/scripts/packages/debian/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample
73		79
74	.include <bsd.port.mk>	80	.include <bsd.port.post.mk>

Line 0 Link Here

(-)bazel/files/extra-i386_src_BUILD (+11 lines)
	1	--- src/BUILD.orig 2017-07-31 10:06:21.426927000 +0200
	2	+++ src/BUILD 2017-07-31 10:06:44.279345000 +0200
	3	@@ -179,7 +179,7 @@
	4	"//src/java_tools/singlejar:SingleJar_deploy.jar",
	5	],
	6	"//conditions:default": [
	7	- "//src/tools/singlejar:singlejar",
	8	+ "//src/java_tools/singlejar:SingleJar_deploy.jar",
	9	],
	10	}) + select({
	11	"//tools/jdk:jdk7": [],

Return to bug 221114