pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/libepoll-shim



Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jul  6 18:26:17 UTC 2026

Modified Files:
        pkgsrc/devel/libepoll-shim: buildlink3.mk
Added Files:
        pkgsrc/devel/libepoll-shim: builtin.mk

Log Message:
libepoll-shim: add builtin.mk to skip on Linux

libepoll-shim is required for systems that have kqueue but not epoll.
Linux does have epoll, so it is (a) unnecessary and (b) doesn't build.

The detection logic is currently hardcoded to Linux only; I suppose it
could be improved further.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libepoll-shim/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libepoll-shim/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libepoll-shim/buildlink3.mk
diff -u pkgsrc/devel/libepoll-shim/buildlink3.mk:1.2 pkgsrc/devel/libepoll-shim/buildlink3.mk:1.3
--- pkgsrc/devel/libepoll-shim/buildlink3.mk:1.2        Sat Aug  6 07:22:32 2022
+++ pkgsrc/devel/libepoll-shim/buildlink3.mk    Mon Jul  6 18:26:17 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/08/06 07:22:32 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2026/07/06 18:26:17 bsiegert Exp $
 
 BUILDLINK_TREE+=       libepoll-shim
 
@@ -8,6 +8,12 @@ LIBEPOLL_SHIM_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libepoll-shim+=  libepoll-shim>=0.0.20210418
 BUILDLINK_PKGSRCDIR.libepoll-shim?=    ../../devel/libepoll-shim
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+CHECK_BUILTIN.libepoll-shim:=  yes
+.include "../../devel/libepoll-shim/builtin.mk"
+CHECK_BUILTIN.libepoll-shim:=  no
+
 .endif # LIBEPOLL_SHIM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libepoll-shim

Added files:

Index: pkgsrc/devel/libepoll-shim/builtin.mk
diff -u /dev/null pkgsrc/devel/libepoll-shim/builtin.mk:1.1
--- /dev/null   Mon Jul  6 18:26:17 2026
+++ pkgsrc/devel/libepoll-shim/builtin.mk       Mon Jul  6 18:26:17 2026
@@ -0,0 +1,49 @@
+# $NetBSD: builtin.mk,v 1.1 2026/07/06 18:26:17 bsiegert Exp $
+
+BUILTIN_PKG:=  libepoll-shim
+
+.if !defined(IS_BUILTIN.libepoll-shim)
+IS_BUILTIN.libepoll-shim=      no
+# epoll is built into the Linux kernel/glibc natively.
+.  if ${OPSYS} == "Linux"
+IS_BUILTIN.libepoll-shim=      yes
+.  endif
+.endif
+MAKEVARS+=                     IS_BUILTIN.libepoll-shim
+
+.if !defined(BUILTIN_PKG.libepoll-shim)
+.  if !empty(IS_BUILTIN.libepoll-shim:M[yY][eE][sS])
+# Fake a high version number since native Linux epoll fulfills all needs.
+BUILTIN_PKG.libepoll-shim=     libepoll-shim-99.99
+.  endif
+.endif
+MAKEVARS+=                     BUILTIN_PKG.libepoll-shim
+
+.if !defined(USE_BUILTIN.libepoll-shim)
+USE_BUILTIN.libepoll-shim=     ${IS_BUILTIN.libepoll-shim}
+.  if defined(BUILTIN_PKG.libepoll-shim)
+.    for _depend_ in ${BUILDLINK_API_DEPENDS.libepoll-shim}
+.      if !empty(USE_BUILTIN.libepoll-shim:M[yY][eE][sS])
+USE_BUILTIN.libepoll-shim!=    \
+       if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.libepoll-shim}; then \
+               ${ECHO} "yes";                                          \
+       else                                                            \
+               ${ECHO} "no";                                           \
+       fi
+.      endif
+.    endfor
+.  endif
+.endif
+MAKEVARS+=                     USE_BUILTIN.libepoll-shim
+
+CHECK_BUILTIN.libepoll-shim?=  no
+.if !empty(CHECK_BUILTIN.libepoll-shim:M[nN][oO])
+.  if !empty(USE_BUILTIN.libepoll-shim:M[yY][eE][sS])
+# On Linux, no extra compiler/linker flags are required for epoll.
+BUILDLINK_TARGETS+=            libepoll-shim-builtin-noop
+
+.phony: libepoll-shim-builtin-noop
+libepoll-shim-builtin-noop:
+       @${DO_NADA}
+.  endif
+.endif



Home | Main Index | Thread Index | Old Index