Date: Sun, 8 Oct 2023 14:52:50 GMT From: Dave Cottlehuber <dch@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d22277621a9d - main - www/h2o-devel: move if..endif block after bsd.port.pre.mk Message-ID: <202310081452.398EqoSA039595@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=d22277621a9d89f2e5ab02a68b40d56c4c37e2b3 commit d22277621a9d89f2e5ab02a68b40d56c4c37e2b3 Author: Dave Cottlehuber <dch@FreeBSD.org> AuthorDate: 2023-10-08 14:52:43 +0000 Commit: Dave Cottlehuber <dch@FreeBSD.org> CommitDate: 2023-10-08 14:52:43 +0000 www/h2o-devel: move if..endif block after bsd.port.pre.mk Reported by: dvl Fixes: 79b919312ef2ac04ff54f97adb9872a7357bb344 --- www/h2o-devel/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile index 5cf48e420fd0..2300a41d9502 100644 --- a/www/h2o-devel/Makefile +++ b/www/h2o-devel/Makefile @@ -29,9 +29,6 @@ SHEBANG_FILES= share/h2o/start_server CMAKE_ARGS+= -DBUILD_SHARED_LIBS=OFF \ -DWITH_BUNDLED_SSL=OFF -.if ${ARCH} == "i386" -CMAKE_ARGS+= -DWITH_FUSION=OFF -.endif CONFLICTS= h2o @@ -59,6 +56,12 @@ MRUBY_DESC= Build with embedded mruby handler support MRUBY_USES= bison ruby:build MRUBY_CMAKE_BOOL= WITH_MRUBY +.include <bsd.port.pre.mk> + +.if ${ARCH} == i386 +CMAKE_ARGS+= -DWITH_FUSION=OFF +.endif + .include <bsd.port.options.mk> post-install: @@ -72,4 +75,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.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?202310081452.398EqoSA039595>