Date: Sun, 19 Feb 2023 13:42:42 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ee00fe7327a7 - main - x11-wm/fvwm3: Fix build on -CURRENT Message-ID: <202302191342.31JDggHD080985@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee00fe7327a7ef3a5ab4f237db31c0cc508c234e commit ee00fe7327a7ef3a5ab4f237db31c0cc508c234e Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2023-02-19 08:29:24 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2023-02-19 13:41:52 +0000 x11-wm/fvwm3: Fix build on -CURRENT Add extra compiler flag for configure when building on -CURRENT after import of llvm 15. Some warnings were promoted to errors, but the configure script expects them to be warnings. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D38669 --- x11-wm/fvwm3/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile index 775eeb1b6c8d..20ec49a24817 100644 --- a/x11-wm/fvwm3/Makefile +++ b/x11-wm/fvwm3/Makefile @@ -73,6 +73,15 @@ XCURSOR_CONFIGURE_ENABLE= xcursor XPM_USE= xorg=xpm XPM_CONFIGURE_OFF= --with-xpm-library=no +.include <bsd.port.options.mk> + +# Clang 15 promoted some warnings to errors. The upstream configure script +# expects one of them to be only a warning. Work around this by explicitly +# disabling the error here. FIXME: Check whether still needed on upgrades. +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 +CONFIGURE_ARGS+= CFLAGS="${CFLAGS} -Wno-error=int-conversion" +.endif + post-patch: @${REINPLACE_CMD} -e 's,/etc/,${LOCALBASE}/etc/,g' \ ${WRKSRC}/bin/fvwm-menu-desktop.in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302191342.31JDggHD080985>