From nobody Mon Feb 13 11:18:11 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PFhfC5gZ8z3q4CX; Mon, 13 Feb 2023 11:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFhfC4yX7z3pyq; Mon, 13 Feb 2023 11:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676287091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iePAAHh9kE6vkk4r5QPm8jLrnYfHdsBMrTrxX2Bi150=; b=SyvzpsDDQEClvHn27gMnfP56TMzAQgB/unf1FDqLJ1VyQM5sAiJ1EA6X2LxDekdra3qijc xeTDPG0HsRAxx3ULVBV8pRhUIoE6VmTlaL/O/pan2JQ4pvVw8P2OlEIe5+BLWz7bZBCeID q1mYNqVn/zHPX5mCRKNCcwbcirM9Y8Z++Slo/Zl7jvpea1O0YYMXKtCevEnfCQUDei9Te4 fh1raw+AXSPw9QZrQtf/h0djWkbxK/dSHmgsb+i/1VgA6EPNk2fXdbluksUYUIHvbeg3IK vv3L4NsQMpFxTA3UXMWJ8THz3zyOQd5DeOkoW62Ts5ftEckuCjxYpS0LAYPq/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676287091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iePAAHh9kE6vkk4r5QPm8jLrnYfHdsBMrTrxX2Bi150=; b=plKst/Eev/IsUolIBBzRMJ5g70QSOVMaYxfoKX8NRoPidH9oXS5oIQzZEctcl23YMrZrzx 0Wl5D4torwLRR5663Z7IN37PKmLt6FZ+xzk2pKPUgpW29BXb0FskssBjRukud/qOqzQUcy M5D1YBBTEJy3voqDXUgn0e3wGZrr71GsasNjcHzwjIpMnY4jZHtoji6XdSmMoLakCjRR6l zkPrXrgCIIgjeIMsz5MQ+lWLjTS8K98clG47sKymrFY2FFbAycvjUSsJNpL68fnzYTeipE ZD63yZIqCSbkH0ANAA84rh4eexlxOugoYvxrfT6wfHqSN5wA8IXwx2xp8W6Y8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676287091; a=rsa-sha256; cv=none; b=vznFRviqodQAKx1WdyIIGBlzmfofstrqrzywvlJL1BfISzweR1gd96qa6e9GtY/lWHiVR/ E62oJh65u2+DTvTJcSb6bXZVOayRXTqV6Poq+53m6Xwdk1lr6qB95yX7rNWlCrX3R/PuZ6 /xwMRvnwJej8iEDAi5B2QBFTSsLaIfzQO7HjuVHo6sHKkLynSykPhVRGriw75diunq7rEV pmqFupLVMVkyY9+uxc91+2hwmefCLeuoGTeO9FkIfPdomwQQARceONNOeubzokw/8OKKtH n0tbB8J7jDqLXfyGAAnwJML9gHfLZr531MUdwR1EJUuPjSDXF3fyMscxqeaLjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PFhfC42pLzFv4; Mon, 13 Feb 2023 11:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31DBIBbA010188; Mon, 13 Feb 2023 11:18:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DBIBgE010187; Mon, 13 Feb 2023 11:18:11 GMT (envelope-from git) Date: Mon, 13 Feb 2023 11:18:11 GMT Message-Id: <202302131118.31DBIBgE010187@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: e06325ac6f62 - main - devel/z88dk: try to unbreak the port's build against Clang 15 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e06325ac6f6270703d2bacf1a4afac917447a10f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=e06325ac6f6270703d2bacf1a4afac917447a10f commit e06325ac6f6270703d2bacf1a4afac917447a10f Author: Alexey Dokuchaev AuthorDate: 2023-02-13 11:17:52 +0000 Commit: Alexey Dokuchaev 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}