Date: Wed, 19 Jul 2023 17:30:52 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f8cebce7970d - main - sysutils/mstflint: Fix build with llvm16 Message-ID: <202307191730.36JHUqE5026984@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8cebce7970d6994b048a8a11e54634933f9d188 commit f8cebce7970d6994b048a8a11e54634933f9d188 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-07-19 17:24:05 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-07-19 17:30:39 +0000 sysutils/mstflint: Fix build with llvm16 - Utilize USES=localbase - Pet portclippy Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- sysutils/mstflint/Makefile | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/sysutils/mstflint/Makefile b/sysutils/mstflint/Makefile index 9fd6dcab207e..efb8fa6599c5 100644 --- a/sysutils/mstflint/Makefile +++ b/sysutils/mstflint/Makefile @@ -12,42 +12,36 @@ LICENSE_COMB= dual LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE -USES= autoreconf libtool gmake pkgconfig +USES= autoreconf gmake libtool localbase:ldflags pkgconfig +USE_CXXSTD= c++14 +USE_GITHUB= yes +GH_ACCOUNT= Mellanox -OPTIONS_DEFINE= FWMANAGER ADAB STATIC -OPTIONS_SUB= yes +GNU_CONFIGURE= yes +OPTIONS_DEFINE= FWMANAGER ADAB STATIC .if defined(LITE) OPTIONS_SLAVE= FWMANAGER ADAB STATIC .endif +OPTIONS_SUB= yes -FWMANAGER_DESC= Build with mstfwmanager and mstarchive ADAB_DESC= Build with mstreg and mstlink +FWMANAGER_DESC= Build with mstfwmanager and mstarchive STATIC_DESC= Static binary (disable curl support) + +ADAB_CONFIGURE_ON= --enable-adb-generic-tools +FWMANAGER_CONFIGURE_ON= --enable-fw-mgr +STATIC_USES_OFF= ssl STATIC_CONFIGURE_ON= --enable-all-static --disable-dc \ --disable-openssl --disable-inband -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include - -GNU_CONFIGURE= yes - -USE_GITHUB= yes -GH_ACCOUNT= Mellanox - .include <bsd.port.options.mk> pre-patch: @${ECHO} '#define TOOLS_GIT_SHA "N/A"' > ${WRKSRC}/common/gitversion.h @${MKDIR} ${WRKSRC}/config -.if ${PORT_OPTIONS:MSTATIC} -.else -USES+= ssl -.endif - .if ${PORT_OPTIONS:MADAB} -CONFIGURE_ARGS+= --enable-adb-generic-tools .if ${PORT_OPTIONS:MSTATIC} BROKEN= does not link: expat2 no longer provides static library by default BUILD_DEPENDS+= xmlwf:textproc/expat2 \ @@ -59,7 +53,6 @@ LIB_DEPENDS+= libexpat.so:textproc/expat2 \ .endif .if ${PORT_OPTIONS:MFWMANAGER} -CONFIGURE_ARGS+= --enable-fw-mgr .if ${PORT_OPTIONS:MSTATIC} BUILD_DEPENDS+= xmllint:textproc/libxml2 \ ${LOCALBASE}/include/boost/algorithm/string/detail/formatter_regex.hpp:devel/boost-libs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307191730.36JHUqE5026984>