diff options
| author | marino <marino@FreeBSD.org> | 2016-09-13 00:49:12 +0000 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2016-09-13 00:49:12 +0000 |
| commit | a12804d3b780bf8c495c97018fad29e6b61ec436 (patch) | |
| tree | c754272b9887ba258ae6055a5211a565d1fe1a35 | |
| parent | 4697b0e843fb5870abb2b0e14c77434e70d13ee4 (diff) | |
| download | FreeBSD-ports-a12804d3b780bf8c495c97018fad29e6b61ec436.zip FreeBSD-ports-a12804d3b780bf8c495c97018fad29e6b61ec436.tar.gz | |
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.
| -rw-r--r-- | devel/hadoop/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile index 8948cfb..a7723c7 100644 --- a/devel/hadoop/Makefile +++ b/devel/hadoop/Makefile @@ -78,7 +78,11 @@ MAKE_ARGS= -Dbuild.classes=${WRKSRC}/hadoop-core-${PORTVERSION}.jar -Dversion=${ -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> |
