From nobody Wed Sep 06 20:56:09 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 4RgvmT6GHdz4sxBq; Wed, 6 Sep 2023 20:56:09 +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 4RgvmT3j0Dz3KwH; Wed, 6 Sep 2023 20:56:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033769; 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=MZ5IiRxZ49ZHA7ZDeTep3xsGsrhQSunPxAfQJBbsDgU=; b=sOUgpFCCnVkPXK3jWU/e8S1qIlV7ndnD2ot4ph7Y8iA3Q+gzPkGsuJvVu7pVi1YuP65flK STJe7flBAqhyASFjV9u7U93y1XPXUgt5wfHdHJ2IFqhikI//0YtFQ2StN2egBweLZ9dRb9 FRpEkOfGvzKRgKVyND6E9WOiu8TaAm8S4I3q9nBVbZ77DdvB/6eqymxk2TrHrFdaYMQLaw 3T9pXidc3K/bRIHqfrn92hdgMbJ8oru+AvQDsmCDJgL6Xgh8rTKQUZegwE1Z5WAPMRHVup uuwf9TmKq9TSjQ5Z3UF/Um1/b9MfWtSxjdz1LHMH2iEWuS0+O01XcRg7LX7/zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694033769; a=rsa-sha256; cv=none; b=ann6008rSdJhmTwSn/r0Q46jDToIlZICYLsDnyyghcUE+s+ylamXNjaKfvkFdaggwKmSTG BTn3JozEFhjkb+8nBeZYC1tV945BUtTrEsK0MVic2d/i7iKxQI28iBt65ob5mL6qcxAeQG JnbHesLwZKCNdhyd13osrkRk+c4y/eMFlJkvZBV6geHeA3zyO7a1C77TMkDj9H+cZj8K+Y dkxpBezPCAOYSjVP8N9JCy390gYv8BDtj+KOMXD36Cuiiou5SJHoDLak//lmwBQj8Si61L f1cbegU0/9TuzZHT/y9I45uRc7FsvsoinNtIB5N7w0oZ6x3O8fYMOrFee6YuQA== 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=1694033769; 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=MZ5IiRxZ49ZHA7ZDeTep3xsGsrhQSunPxAfQJBbsDgU=; b=xojhz2GJsxbZkEV4rB/wVaVM63uTAz0CbaawnVySi6N4A/EtA4HnjiHZqE/HyB2oTyfxPY Im7xsYXBicE/YyJ7ZxI1O1JyjogZcR3CZzDqPua2I7Zvucz0A8CubvOXXI78V+MVIDSNob T7k9gkETWNbgOsc2gwCo+xvvnzot+cZYc6qCwXQy/6FZELv+W/YZ9+df2O9C5HRXwH4jjc oK9La2ETO1eb5j0bOt/pbJz7O+uAlSPjOuBw7PUlYrUw8HQcLGDUJbaZFsDpusw4Nau39H mjI7+RQF5i1Dh3TOYtWtECDys7ucW/JHmNXIhClpgrt2jB8rh4AH2ayAeOvMYw== 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 4RgvmT2cXSzXJy; Wed, 6 Sep 2023 20:56:09 +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 386Ku9uK022707; Wed, 6 Sep 2023 20:56:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Ku92I022704; Wed, 6 Sep 2023 20:56:09 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:56:09 GMT Message-Id: <202309062056.386Ku92I022704@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 8ea21bc0eebb - 2023Q3 - devel/p5-IO-AIO: Fix build on FreeBSD 14+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 8ea21bc0eebb211045e62b63a83cc1b26ec125bc Auto-Submitted: auto-generated The branch 2023Q3 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ea21bc0eebb211045e62b63a83cc1b26ec125bc commit 8ea21bc0eebb211045e62b63a83cc1b26ec125bc Author: Po-Chuan Hsieh AuthorDate: 2023-09-06 20:49:40 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-06 20:56:03 +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 (cherry picked from commit 600ca97fd58482c907708888a7af879219540a79) --- 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