Attachment 241263 Details for Bug 270599 – patch

[patch] patch

ifitworksitworks.patch (text/plain), 2.43 KB, created by (intentionally left blank) on 2023-04-02 10:25:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: (intentionally left blank)

Created: 2023-04-02 10:25:48 UTC

Size: 2.43 KB

patch

obsolete

>From d4e26f0c4638cb4c55b2f5f22c52e8668da746f0 Mon Sep 17 00:00:00 2001
>From: Literally Who? <throwaway_vthgwq4@protonmail.com>
>Date: Sun, 2 Apr 2023 10:11:25 +0000
>Subject: [PATCH] devel/libepoll-shim: workaround incompatible kqueue1(2)
>
>Hack source to always use compat_kqueue1 rather than kqueue1
>until base fix (review D39377 or later) lands.
>
>PR:		?
>Regressed by:	base 375732cc6e46
>---
> devel/libepoll-shim/Makefile                  |  1 +
> .../files/patch-kqueue1-incompat              | 45 +++++++++++++++++++
> 2 files changed, 46 insertions(+)
> create mode 100644 devel/libepoll-shim/files/patch-kqueue1-incompat
>
>diff --git a/devel/libepoll-shim/Makefile b/devel/libepoll-shim/Makefile
>index baee02d5eb72..afaa1a8e2440 100644
>--- a/devel/libepoll-shim/Makefile
>+++ b/devel/libepoll-shim/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	libepoll-shim
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.0.20220703
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
> MAINTAINER=	x11@FreeBSD.org
>diff --git a/devel/libepoll-shim/files/patch-kqueue1-incompat b/devel/libepoll-shim/files/patch-kqueue1-incompat
>new file mode 100644
>index 000000000000..e7ace95c48c3
>--- /dev/null
>+++ b/devel/libepoll-shim/files/patch-kqueue1-incompat
>@@ -0,0 +1,45 @@
>+# Workaround incompatible kqueue1 after https://reviews.freebsd.org/D39271
>+
>+--- src/CMakeLists.txt
>++++ src/CMakeLists.txt
>+@@ -44,7 +44,6 @@ include(CheckSymbolExists)
>+ check_symbol_exists(eventfd "sys/eventfd.h" HAVE_EVENTFD)
>+ check_symbol_exists(timerfd_create "sys/timerfd.h" HAVE_TIMERFD)
>+ 
>+-check_symbol_exists(kqueue1 "sys/event.h" HAVE_KQUEUE1)
>+ add_compat_target(kqueue1 "NOT;HAVE_KQUEUE1")
>+ check_symbol_exists(sigandset "signal.h" HAVE_SIGANDSET)
>+ check_symbol_exists(sigorset "signal.h" HAVE_SIGORSET)
>+--- src/compat_kqueue1.h
>++++ src/compat_kqueue1.h
>+@@ -3,8 +3,4 @@
>+ 
>+ int compat_kqueue1(int);
>+ 
>+-#ifdef COMPAT_ENABLE_KQUEUE1
>+-#define kqueue1 compat_kqueue1
>+-#endif
>+-
>+ #endif
>+--- src/epoll_shim_ctx.c
>++++ src/epoll_shim_ctx.c
>+@@ -242,7 +242,7 @@ epoll_shim_ctx_create_desc(EpollShimCtx *epoll_shim_ctx, int flags, /**/
>+ 
>+ 	rwlock_lock_write(&epoll_shim_ctx->rwlock);
>+ 
>+-	int kq = kqueue1(flags);
>++	int kq = compat_kqueue1(flags);
>+ 	if (kq < 0) {
>+ 		ec = errno;
>+ 		goto out_kqueue;
>+--- src/epollfd_ctx.c
>++++ src/epollfd_ctx.c
>+@@ -543,7 +543,7 @@ registered_fds_node_register_for_completion(int *kq,
>+ 	}
>+ 
>+ 	if (*kq < 0) {
>+-		*kq = kqueue1(O_CLOEXEC);
>++		*kq = compat_kqueue1(O_CLOEXEC);
>+ 	}
>+ 
>+ 	if (*kq >= 0) {
>-- 
>2.40.0
>

Flags:

throwaway_vthgwq4: maintainer-approval? (jbeich)

Actions: View | Diff

Attachments on bug 270599: 241263