Attachment #211521 for bug #243649




# $FreeBSD$

PORTNAME=	libepoll-shim
PORTVERSION=	0.0.20191117
CATEGORIES=	devel

MAINTAINER=	x11@FreeBSD.org
COMMENT=	Small epoll implementation using kqueue

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		cmake compiler:c11
USE_LDCONFIG=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	jiixyj
GH_PROJECT=	epoll-shim
GH_TAGNAME=	1f003fa40f8ac3858dcc474b96cc4aee5820dcd2

do-test:
	# Exclude certain tests in resource restricted environments
	@(if [ `ulimit -n` -lt 20100 ]; then \
	    SKIP_TESTS="-E ^(perf-many-fds.perf_many_fds__perf"; \
	    if [ `ulimit -n` -lt 1100 ]; then \
	        SKIP_TESTS=$$SKIP_TESTS"|timerfd-test.timerfd__many_timers"; \
	    fi; \
	    SKIP_TESTS=$$SKIP_TESTS")$$"; \
	fi; \
	cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} $$SKIP_TESTS)

.include <bsd.port.mk>
MAKE_ARGS=	WITHOUT_PROFILE=yes

.include <bsd.port.pre.mk>

post-patch:
	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile
.if "${CHOSEN_COMPILER_TYPE}" == "gcc"
	@${REINPLACE_CMD} -e 's|Wno-missing-variable-declarations|Wno-missing-declarations|' \
		-e 's|-Wno-thread-safety-analysis||' ${WRKSRC}/Makefile
.endif

pre-install:
	@${MKDIR} ${STAGEDIR}/${PREFIX}/include/libepoll-shim/sys

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)devel/libepoll-shim/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1554794906	1	TIMESTAMP = 1577836295
2	SHA256 (FreeBSDDesktop-epoll-shim-0.0.20190311-1d1135384395dbf38eea00680ca28ead04f8dce2_GH0.tar.gz) = 689aaf4a6f8f14a715986f03c283cbabf404a2ac5370ad6430f28cc8e101b554	2	SHA256 (jiixyj-epoll-shim-0.0.20191117-1f003fa40f8ac3858dcc474b96cc4aee5820dcd2_GH0.tar.gz) = 30b8804f4ef26b0a67967f00824cb5e922721165219ece2069a48ccc10977903
3	SIZE (FreeBSDDesktop-epoll-shim-0.0.20190311-1d1135384395dbf38eea00680ca28ead04f8dce2_GH0.tar.gz) = 16341	3	SIZE (jiixyj-epoll-shim-0.0.20191117-1f003fa40f8ac3858dcc474b96cc4aee5820dcd2_GH0.tar.gz) = 39514




https://github.com/jiixyj/epoll-shim/commit/0f1665e12f2de53bb49a24415f033a60a4a381d1.diff
--- test/epoll-test.c.orig	2019-11-17 16:39:19 UTC
+++ test/epoll-test.c
@@ -222,12 +222,9 @@ ATF_TC_WITHOUT_HEAD(epoll__event_size);
 ATF_TC_BODY_FD_LEAKCHECK(epoll__event_size, tc)
 {
 	struct epoll_event event;
-#if defined(__amd64__)
+	// this check works on 32bit _and_ 64bit, since
+	// sizeof(epoll_event) == sizeof(uint32_t) + sizeof(uint64_t)
 	ATF_REQUIRE(sizeof(event) == 12);
-#else
-	// TODO(jan): test for other architectures
-	abort();
-#endif
 }
 
 static void




https://github.com/jiixyj/epoll-shim/commit/0f1665e12f2de53bb49a24415f033a60a4a381d1.diff
--- test/tst-eventfd.c.orig	2019-11-17 16:39:19 UTC
+++ test/tst-eventfd.c
@@ -351,8 +351,8 @@ int poll_test(void)
     /* write to event and check read poll */
     c = 1;
     s = write(efd, &c, sizeof(c));
-    if (s != sizeof(s)) {
-        handle_error("");
+    if (s != sizeof(c)) {
+        handle_error("failed to write event.");
     }
 
 #ifndef __FreeBSD__

Line 1 Link Here

(-)devel/libepoll-shim/pkg-descr (-1 / +5 lines)
1	epoll shim implemented using kevent.	1	epoll-shim is a small library that implements epoll on top of kqueue. It
		2	has been successfully used to port libinput, libevdev, Wayland and more
		3	software to FreeBSD.
		4
		5	WWW: https://github.com/jiixyj/epoll-shim

Lines 1-7 Link Here

(-)devel/libepoll-shim/pkg-plist (-1 / +4 lines)
1	include/libepoll-shim/sys/epoll.h	1	include/libepoll-shim/sys/epoll.h
		2	include/libepoll-shim/sys/eventfd.h
2	include/libepoll-shim/sys/signalfd.h	3	include/libepoll-shim/sys/signalfd.h
3	include/libepoll-shim/sys/timerfd.h	4	include/libepoll-shim/sys/timerfd.h
4	lib/libepoll-shim.a	5	lib/cmake/epoll-shim/epoll-shim-config.cmake
		6	lib/cmake/epoll-shim/epoll-shim-targets-%%CMAKE_BUILD_TYPE%%.cmake
		7	lib/cmake/epoll-shim/epoll-shim-targets.cmake
5	lib/libepoll-shim.so	8	lib/libepoll-shim.so
6	lib/libepoll-shim.so.0	9	lib/libepoll-shim.so.0
7	libdata/pkgconfig/epoll-shim.pc	10	libdata/pkgconfig/epoll-shim.pc

Return to bug 243649

Lines 2-35 Link Here

(-)devel/libepoll-shim/Makefile (-21 / +18 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libepoll-shim	4	PORTNAME= libepoll-shim
5	PORTVERSION= 0.0.20190311	5	PORTVERSION= 0.0.20191117
6	CATEGORIES= devel	6	CATEGORIES= devel
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
9	COMMENT= epoll shim implemented using kevent	9	COMMENT= Small epoll implementation using kqueue
10		10
11	LICENSE= MIT	11	LICENSE= MIT
		12	LICENSE_FILE= ${WRKSRC}/LICENSE
12		13
		14	USES= cmake compiler:c11
		15	USE_LDCONFIG= yes
13	USE_GITHUB= yes	16	USE_GITHUB= yes
14	GH_ACCOUNT= FreeBSDDesktop	17	GH_ACCOUNT= jiixyj
15	GH_PROJECT= epoll-shim	18	GH_PROJECT= epoll-shim
16	GH_TAGNAME= 1d1135384395dbf38eea00680ca28ead04f8dce2	19	GH_TAGNAME= 1f003fa40f8ac3858dcc474b96cc4aee5820dcd2
17		20
18	USE_LDCONFIG= yes	21	do-test:
		22	# Exclude certain tests in resource restricted environments
		23	@(if [ `ulimit -n` -lt 20100 ]; then \
		24	SKIP_TESTS="-E ^(perf-many-fds.perf_many_fds__perf"; \
		25	if [ `ulimit -n` -lt 1100 ]; then \
		26	SKIP_TESTS=$$SKIP_TESTS"\|timerfd-test.timerfd__many_timers"; \
		27	fi; \
		28	SKIP_TESTS=$$SKIP_TESTS")$$"; \
		29	fi; \
		30	cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} $$SKIP_TESTS)
19		31
20	USES= compiler uidfix	32	.include <bsd.port.mk>
21	MAKE_ARGS= WITHOUT_PROFILE=yes
22
23	.include <bsd.port.pre.mk>
24
25	post-patch:
26	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile
27	.if "${CHOSEN_COMPILER_TYPE}" == "gcc"
28	@${REINPLACE_CMD} -e 's\|Wno-missing-variable-declarations\|Wno-missing-declarations\|' \
29	-e 's\|-Wno-thread-safety-analysis\|\|' ${WRKSRC}/Makefile
30	.endif
31
32	pre-install:
33	@${MKDIR} ${STAGEDIR}/${PREFIX}/include/libepoll-shim/sys
34
35	.include <bsd.port.post.mk>

Line 0 Link Here

(-)devel/libepoll-shim/files/patch-test_epoll-test.c (+18 lines)
	1	https://github.com/jiixyj/epoll-shim/commit/0f1665e12f2de53bb49a24415f033a60a4a381d1.diff
	2	--- test/epoll-test.c.orig 2019-11-17 16:39:19 UTC
	3	+++ test/epoll-test.c
	4	@@ -222,12 +222,9 @@ ATF_TC_WITHOUT_HEAD(epoll__event_size);
	5	ATF_TC_BODY_FD_LEAKCHECK(epoll__event_size, tc)
	6	{
	7	struct epoll_event event;
	8	-#if defined(__amd64__)
	9	+ // this check works on 32bit _and_ 64bit, since
	10	+ // sizeof(epoll_event) == sizeof(uint32_t) + sizeof(uint64_t)
	11	ATF_REQUIRE(sizeof(event) == 12);
	12	-#else
	13	- // TODO(jan): test for other architectures
	14	- abort();
	15	-#endif
	16	}
	17
	18	static void

Line 0 Link Here

(-)devel/libepoll-shim/files/patch-test_tst-eventfd.c (+14 lines)
	1	https://github.com/jiixyj/epoll-shim/commit/0f1665e12f2de53bb49a24415f033a60a4a381d1.diff
	2	--- test/tst-eventfd.c.orig 2019-11-17 16:39:19 UTC
	3	+++ test/tst-eventfd.c
	4	@@ -351,8 +351,8 @@ int poll_test(void)
	5	/* write to event and check read poll */
	6	c = 1;
	7	s = write(efd, &c, sizeof(c));
	8	- if (s != sizeof(s)) {
	9	- handle_error("");
	10	+ if (s != sizeof(c)) {
	11	+ handle_error("failed to write event.");
	12	}
	13
	14	#ifndef __FreeBSD__