From nobody Wed Sep 6 20:53:11 2023 X-Original-To: dev-commits-ports-main@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 4Rgvj35NF2z4sw5f; Wed, 6 Sep 2023 20:53: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 4Rgvj34cY9z3F3K; Wed, 6 Sep 2023 20:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033591; 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=/oZacvnAHb1moDbWfVsIPEqQj/Riq6haoGZIf92RtcQ=; b=h3QC98bmKW6qXb1TWC8Im+xgOg/LzVXDNi2nJWMtVnY4d58dSJGw71iaZqD06qYRSuq39p CHC7fyv+jBqW6f6ThXdpzLN07dLhAm0DvyzvWHGMfncnyA6SIx1YcJbsjtfw7Y25Cfp2EE m4GwMifqAaT4Go0W1nptLEBHX9A1ckR63SHWpdJugOdLzeZvCC9AEVpfdGD/1Y3O5NJAWh kKKc7kEQ1Wl4s1dyK0xIlxUoWgl0JI44SrBE9YJOiBt24DjdQvoqJlfCu/YbUKOQpCWQrm AP1fXRsG+T5JJvyAomGEk6u+wbWS+t5eq9PXxTyMJVSKjAa5CNoTHv7LskKedg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694033591; a=rsa-sha256; cv=none; b=iRhHdKsBnH77+8MCKxjVanSe0AlHkcr9L39XgvkIHYzC1cAPttFaJBfwPP8GMn8/9DC5rh aP4GBhd/goxRq69nXHrDTQlk6wDnk22i3NsqsMlstowr1wUWD/ygHLpLB7aOeYmoth5Kns pPN9WiEnT+758njY//osCJG0CqDb61OORk9UOyIvRVuYAkJnnH0CsYaKtXwCEpc4q8gjDu BZFEwxxheQeCTSyEy5DHeJGQx3Fpu3ztTL1lniYDaUVKwp/TK82WLSw3HrbLrpK1qqlL01 7l/ijjygWmaa3kItW5AvGWyqxP4Y/NPCZWcqvIuBBK5E95dENMD8Ssv/WHoHaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033591; 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=/oZacvnAHb1moDbWfVsIPEqQj/Riq6haoGZIf92RtcQ=; b=oEylNIMRtVZLDsO5WJxpjC8Dwdi2BmmYzxlcmfJ0Suikf8R1pFyAh9ZPIdVbq92pyRRusn oz7zUpy+zzzS37MAJgRTC6K7PpFrLvhvZJ1Q2VgtgHArE/jEvBmI/W9lEwgpsl1ADUVho2 PrZ3d3R+5CupRXt4y3obSP0eAlBqPjAZ38aFt2+hBBESE1gsam1XBILQh7HIyaakl3YX2d y34ufuUtBk63xw8iiDojkx2tr7zCjCJwUcj2uUF/e1bNT25eGTYIblvWRlNt3jBvzsxcic WTsgDsBlj00BczHxMz72mtXcE+y/DNlAjdZ+lw/whUMHdRrLgX9K6T/tSGMa+Q== 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 4Rgvj33d1VzXZQ; Wed, 6 Sep 2023 20:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386KrB9V019775; Wed, 6 Sep 2023 20:53:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386KrBOp019772; Wed, 6 Sep 2023 20:53:11 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:53:11 GMT Message-Id: <202309062053.386KrBOp019772@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 600ca97fd584 - main - devel/p5-IO-AIO: Fix build on FreeBSD 14+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 600ca97fd58482c907708888a7af879219540a79 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=600ca97fd58482c907708888a7af879219540a79 commit 600ca97fd58482c907708888a7af879219540a79 Author: Po-Chuan Hsieh AuthorDate: 2023-09-06 20:49:40 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-06 20:49:40 +0000 devel/p5-IO-AIO: Fix build on FreeBSD 14+ In file included from AIO.xs:173: In file included from /usr/include/sys/timerfd.h:33: In file included from /usr/include/sys/proc.h:47: /usr/include/sys/condvar.h:46:8: error: redefinition of 'cv' struct cv { ^ /usr/local/lib/perl5/5.34/mach/CORE/sv.h:243:8: note: previous definition is here struct cv { ^ 618 warnings and 1 error generated. Tested on: 14.0-ALPHA4 --- devel/p5-IO-AIO/files/patch-AIO.xs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/devel/p5-IO-AIO/files/patch-AIO.xs b/devel/p5-IO-AIO/files/patch-AIO.xs index cf26e3bbb7a5..b1df75c1ed23 100644 --- a/devel/p5-IO-AIO/files/patch-AIO.xs +++ b/devel/p5-IO-AIO/files/patch-AIO.xs @@ -1,6 +1,18 @@ ---- AIO.xs.orig 2022-09-25 16:29:50 UTC +--- AIO.xs.orig 2022-09-28 08:22:50 UTC +++ AIO.xs -@@ -2924,7 +2924,7 @@ fexecve (SV *fh, SV *args, SV *envs = &PL_sv_undef) +@@ -169,9 +169,11 @@ + # include + #endif + ++#define cv condvar_cv + #if HAVE_TIMERFD + # include + #endif ++#undef cv + + #if HAVE_RLIMITS + #include +@@ -2926,7 +2928,7 @@ fexecve (SV *fh, SV *args, SV *envs = &PL_sv_undef) OUTPUT: RETVAL int