Date: Sun, 20 Nov 2016 20:58:21 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426629 - head/devel/kore Message-ID: <201611202058.uAKKwLlQ065091@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Nov 20 20:58:21 2016 New Revision: 426629 URL: https://svnweb.freebsd.org/changeset/ports/426629 Log: devel/kore: unbreak build on 12.0 src/cli.c:385:9: error: generic selections are a C11-specific feature [-Werror,-Wc11-extensions] appl = basename(pwd); ^ /usr/include/libgen.h:60:21: note: expanded from macro 'basename' #define basename(x) __generic(x, const char *, __old_basename, basename)(x) ^ /usr/include/sys/cdefs.h:337:2: note: expanded from macro '__generic' _Generic(expr, t: yes, default: no) ^ PR: 214638 Reported by: pkg-fallout Submitted by: Tobias Kortkamp <t@tobik.me> (maintainer) Modified: head/devel/kore/Makefile (contents, props changed) Modified: head/devel/kore/Makefile ============================================================================== --- head/devel/kore/Makefile Sun Nov 20 20:58:16 2016 (r426628) +++ head/devel/kore/Makefile Sun Nov 20 20:58:21 2016 (r426629) @@ -47,17 +47,16 @@ JSONRPC_LIB_DEPENDS= libyajl.so:devel/ya DEBUG_VARS= MAKE_ARGS+=DEBUG=1 -.include <bsd.port.pre.mk> - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_9= Base OpenSSL on FreeBSD 9.x is too old -.endif +BROKEN_FreeBSD_9= does not build post-patch: -# Disable kore's own optimizations flags - @${REINPLACE_CMD} 's|CFLAGS+=-O|#|g' ${WRKSRC}/Makefile -# Make sure the correct flags are set when LOCALBASE is not /usr/local - @${REINPLACE_CMD} 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/Makefile +# Disable kore's own optimizations flags, make sure the correct flags +# are set when LOCALBASE is not /usr/local, and allow __generic on +# FreeBSD 12.0-CURRENT after r308264 + @${REINPLACE_CMD} -e 's|CFLAGS+=-O|#|g' \ + -e 's|/usr/local/|${LOCALBASE}/|g' \ + -e 's|-pedantic|-pedantic -Wno-error=c11-extensions|g' \ + ${WRKSRC}/Makefile pre-install: ${STRIP_CMD} ${WRKSRC}/kore @@ -66,4 +65,4 @@ post-install: cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611202058.uAKKwLlQ065091>