Page MenuHomeFreeBSD

devel/libepoll-shim: update to 0.0.20210418
ClosedPublic

Authored by jbeich on Apr 18 2021, 6:18 PM.

Details

Summary

Reported by portscout. See upstream changelog.

Some consumers required fixes e.g.

graphics/wayland failed:

tests/os-wrappers-test.c:89:15: error: expected identifier or '('
fcntl(int fd, int cmd, ...)
              ^
tests/os-wrappers-test.c:89:15: error: expected ')'
tests/os-wrappers-test.c:89:1: note: to match this '('
fcntl(int fd, int cmd, ...)
^
/usr/local/include/libepoll-shim/epoll-shim/detail/common.h:17:2: note: expanded from macro 'fcntl'
        SHIM_SYS_SHIM_HELPERS_SEL(SHIM_SYS_SHIM_FCNTL, __VA_ARGS__, N, 1, 1) \
        ^
/usr/local/include/libepoll-shim/epoll-shim/detail/common.h:11:64: note: expanded from macro 'SHIM_SYS_SHIM_HELPERS_SEL'
#define SHIM_SYS_SHIM_HELPERS_SEL(PREFIX, _2, _1, SUFFIX, ...) PREFIX##_##SUFFIX
                                                               ^
<scratch space>:34:1: note: expanded from here
SHIM_SYS_SHIM_FCNTL_N
^
/usr/local/include/libepoll-shim/epoll-shim/detail/common.h:14:4: note: expanded from macro 'SHIM_SYS_SHIM_FCNTL_N'
        (((cmd) == F_SETFL) ? epoll_shim_fcntl((fd), (cmd), __VA_ARGS__) : \
          ^

biology/ncbi-vdb failed:

In file included from libs/kns/linux/syspoll.c:46:
/usr/local/include/libepoll-shim/sys/epoll.h:63:10: fatal error: 'epoll-shim/detail/common.h' file not found
#include <epoll-shim/detail/common.h>
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
Test Plan
  • All 28 direct consumers built fine on 12.2 amd64
  • Runs fine on 14.0 amd64 via sway 1.6
  • xf86-input-libinput is OK (accidentally tested while debugging something else)

The port itself builds fine on:

  • 11.4 amd64
  • 11.4 i386
  • 12.2 aarch64
  • 12.2 amd64
  • 12.2 i386
  • 13.0 amd64
  • 13.0 i386
  • 14.0 aarch64
  • 14.0 amd64
  • 14.0 armv6
  • 14.0 armv7
  • 14.0 i386
  • gcc10 (mimic powerpc64 on FreeBSD < 13)
  • gcc11

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

jbeich created this revision.

Whoops, the x11/foot failure actually is a bug in epoll-shim. I messed up the "fcntl" dispatch logic a bit, is actually was intended to compile warning free on all C99 conforming compilers. A fix for epoll-shim is incoming.

With epoll-shim 0.0.20210418 the warning in x11/foot should hopefully be fixed.

jbeich retitled this revision from devel/libepoll-shim: update to 0.0.20210417 to devel/libepoll-shim: update to 0.0.20210418.
jbeich edited the summary of this revision. (Show Details)
  • Update
  • Drop x11/foot workaround

All testing redone.

This revision is now accepted and ready to land.Apr 26 2021, 12:41 PM
This revision was automatically updated to reflect the committed changes.