Date: Wed, 6 Sep 2023 14:57:42 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 512d100d0325 - main - cad/librnd: use a cleaner way to unbreak the build on recent -CURRENT Message-ID: <202309061457.386EvgRN019511@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=512d100d0325977600779484c18f0889caa3bf52 commit 512d100d0325977600779484c18f0889caa3bf52 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-09-06 14:55:20 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-09-06 14:55:20 +0000 cad/librnd: use a cleaner way to unbreak the build on recent -CURRENT Relax the strictness of scconfig-based checks for various functions as it involves initializing `int (*)()' pointer with an incompatible expression which is no longer allowed by modern compilers. Fixes: 474cdc3f85b4 --- cad/librnd/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/cad/librnd/Makefile b/cad/librnd/Makefile index 3f1da8ed6866..0754ebf37db9 100644 --- a/cad/librnd/Makefile +++ b/cad/librnd/Makefile @@ -68,15 +68,6 @@ STROKE_CONFIGURE_OFF= --disable-stroke WGET_RUN_DEPENDS= wget:ftp/wget WGET_CONFIGURE_OFF= --disable-lib_wget -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -USES+= llvm:max=15 -CC= clang${LLVM_VERSION} -CPP= clang-cpp${LLVM_VERSION} -CXX= clang++${LLVM_VERSION} -.endif - .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK4} || ${PORT_OPTIONS:MMOTIF} @@ -85,6 +76,10 @@ PLIST_SUB+= GUI="" PLIST_SUB+= GUI="@comment " .endif +post-patch: + @${ECHO_CMD} 'USER_CFLAGS += -DSCCONFIG_ACCEPT_IMPLICIT' \ + >> ${WRKSRC}/scconfig/Makefile + pre-configure: ${REINPLACE_CMD} \ -e 's,%%LOCALBASE%%,${LOCALBASE},' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309061457.386EvgRN019511>