git: 600ca97fd584 - main - devel/p5-IO-AIO: Fix build on FreeBSD 14+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 06 Sep 2023 20:53:11 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=600ca97fd58482c907708888a7af879219540a79
commit 600ca97fd58482c907708888a7af879219540a79
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-09-06 20:49:40 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <sys/eventfd.h>
+ #endif
+
++#define cv condvar_cv
+ #if HAVE_TIMERFD
+ # include <sys/timerfd.h>
+ #endif
++#undef cv
+
+ #if HAVE_RLIMITS
+ #include <sys/time.h>
+@@ -2926,7 +2928,7 @@ fexecve (SV *fh, SV *args, SV *envs = &PL_sv_undef)
OUTPUT: RETVAL
int