Date: Sat, 16 Sep 2023 08:47:20 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Don Lewis <truckman@FreeBSD.org> Cc: Muhammad Moinur Rahman <bofh@FreeBSD.org>, x11@FreeBSD.org, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: dc226fe320b0 - main - devel/libepoll-shim: Fix build on 15 Message-ID: <y1h6-mx6v-wny@FreeBSD.org> In-Reply-To: <tkrat.a7bed96049c08b72__49033.0391957954$1694844602$gmane$org@FreeBSD.org> (Don Lewis's message of "Fri, 15 Sep 2023 23:09:39 -0700 (PDT)") References: <202308252155.37PLt9lC031440@gitrepo.freebsd.org> <tkrat.a7bed96049c08b72__49033.0391957954$1694844602$gmane$org@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Don Lewis <truckman@FreeBSD.org> writes: > On 25 Aug, Muhammad Moinur Rahman wrote: > >> The branch main has been updated by bofh: >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=dc226fe320b057e8d8ab3975cd2044340a5b47e0 >> >> commit dc226fe320b057e8d8ab3975cd2044340a5b47e0 >> Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> >> AuthorDate: 2023-08-25 09:49:23 +0000 >> Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> >> CommitDate: 2023-08-25 21:54:51 +0000 >> >> devel/libepoll-shim: Fix build on 15 >> >> 15 ships with sys/timerfd which is no longer required by the port >> libraries from their own dist. Optionalize installation of that file >> between versions that has the header and that does not have the header. >> >> Approved by: portmgr (blanket) >> --- >> devel/libepoll-shim/Makefile | 3 ++- >> devel/libepoll-shim/pkg-plist | 2 +- >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/devel/libepoll-shim/Makefile b/devel/libepoll-shim/Makefile >> index 732eb51f79e1..5c69d23edd36 100644 >> --- a/devel/libepoll-shim/Makefile >> +++ b/devel/libepoll-shim/Makefile >> @@ -15,7 +15,8 @@ USE_LDCONFIG= yes >> USE_GITHUB= yes >> GH_ACCOUNT= jiixyj >> GH_PROJECT= epoll-shim >> -PLIST_SUB= SHIM_EVENTFD="${exists(/usr/include/sys/eventfd.h):?@comment :}" >> +PLIST_SUB= SHIM_EVENTFD="${exists(/usr/include/sys/eventfd.h):?@comment :}" \ >> + SHIM_TIMERFD="${exists(/usr/include/sys/timerfd.h):?@comment :}" >> >> do-test: >> # Exclude certain tests in resource restricted environments >> diff --git a/devel/libepoll-shim/pkg-plist b/devel/libepoll-shim/pkg-plist >> index 2b866364c8f0..5a7145c65ee8 100644 >> --- a/devel/libepoll-shim/pkg-plist >> +++ b/devel/libepoll-shim/pkg-plist >> @@ -5,7 +5,7 @@ include/libepoll-shim/epoll-shim/detail/write.h >> include/libepoll-shim/sys/epoll.h >> %%SHIM_EVENTFD%%include/libepoll-shim/sys/eventfd.h >> include/libepoll-shim/sys/signalfd.h >> -include/libepoll-shim/sys/timerfd.h >> +%%SHIM_TIMERFD%%include/libepoll-shim/sys/timerfd.h >> lib/cmake/epoll-shim/epoll-shim-config.cmake >> lib/cmake/epoll-shim/epoll-shim-targets-%%CMAKE_BUILD_TYPE%%.cmake >> lib/cmake/epoll-shim/epoll-shim-targets.cmake >> > > It looks like this patch might be needed for building 2023Q3 on 14. > > ====> Running Q/A tests (stage-qa) > ====> Checking for pkg-plist issues (check-plist) > ===> Parsing plist > ===> Checking for items in STAGEDIR missing from pkg-plist > ===> Checking for items in pkg-plist which are not in STAGEDIR > Error: Missing: include/libepoll-shim/sys/timerfd.h > ===> Error: Plist issues found. > *** Error code 1 -CURRENT and -STABLE are not really supported on /quarterly. releng/14.0 didn't have a corresponding -RELEASE yet, so it's no different from stable/14. Backporting this particular fix is unlikely to break anything but then you'd hit bug 273354 and bug 273373, caused by broken API in the features new to FreeBSD 14.0. Besides, 2023Q3 will EOL on 2023-09-30.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?y1h6-mx6v-wny>