Date: Tue, 13 Sep 2016 00:49:12 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421967 - head/devel/hadoop Message-ID: <201609130049.u8D0nDOA089262@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Sep 13 00:49:12 2016 New Revision: 421967 URL: https://svnweb.freebsd.org/changeset/ports/421967 Log: devel/hadoop: Unbreak build (nominal case) The ssl.mk helper can augment the MAKE_ARGS variable with a OPENSSL_CFLAGS definition which just happens to break this port. Add a filter to remove any such definitions if they occur. The issue was introduced when USES+=ssl was added to the makefile to document the SSL requirement. Modified: head/devel/hadoop/Makefile Modified: head/devel/hadoop/Makefile ============================================================================== --- head/devel/hadoop/Makefile Mon Sep 12 23:05:22 2016 (r421966) +++ head/devel/hadoop/Makefile Tue Sep 13 00:49:12 2016 (r421967) @@ -78,7 +78,11 @@ MAKE_ARGS= -Dbuild.classes=${WRKSRC}/had -Dcompile.c++=true -Dmake.cmd=gmake -Dlibhdfs=1 -Dlibrecordio=true -Dskip.record-parser=true ALL_TARGET= compile-core-native compile-c++ compile-c++-libhdfs compile-c++-pipes compile-c++-utils -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> + +# The ssl.mk helper can augment MAKE_ARGS and break the build. Filter out +# the OPENSSL_CFLAGS if it exists to prevent that from happening. +MAKE_ARGS:= ${MAKE_ARGS:NOPENSSL_CFLAGS=*} .if ${ARCH} == "amd64" _HADOOP_ARCH= FreeBSD-amd64-64 @@ -142,4 +146,4 @@ do-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609130049.u8D0nDOA089262>