Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Feb 2023 11:18:11 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: e06325ac6f62 - main - devel/z88dk: try to unbreak the port's build against Clang 15
Message-ID:  <202302131118.31DBIBgE010187@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=e06325ac6f6270703d2bacf1a4afac917447a10f

commit e06325ac6f6270703d2bacf1a4afac917447a10f
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-02-13 11:17:52 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-02-13 11:17:52 +0000

    devel/z88dk: try to unbreak the port's build against Clang 15
    
    zxn.c:34:5: error: incompatible pointer to integer conversion
    initializing 'int' with an expression of type 'void *'
    [-Wint-conversion]
    
    src/cpp/preproc.cpp:98:8: error: unqualified call to 'std::move'
    [-Werror,-Wunqualified-std-cast-call]
    
    Reported by:    pkg-fallout
---
 devel/z88dk/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/devel/z88dk/Makefile b/devel/z88dk/Makefile
index d4a0396c0da9..d3c7721603bd 100644
--- a/devel/z88dk/Makefile
+++ b/devel/z88dk/Makefile
@@ -55,6 +55,11 @@ post-patch:
 		${WRKSRC}/support/multitarget_build/Makefile
 	@${REINPLACE_CMD} -e '/^CFLAGS =/s,$$, -I../../../include,' \
 		${WRKSRC}/test/suites/make.config
+# Fix the build against Clang 15
+	@${REINPLACE_CMD} -e '/patchdata/s,NULL,0,' \
+		${WRKSRC}/src/appmake/zxn.c
+	@${REINPLACE_CMD} -e '/, ifs/s,move,std::&,' \
+		${WRKSRC}/src/z80asm/src/cpp/preproc.cpp
 
 pre-build:
 	${LN} -sf z88dk/bin ${BINARY_LINKDIR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302131118.31DBIBgE010187>