git: dc226fe320b0 - main - devel/libepoll-shim: Fix build on 15
Date: Fri, 25 Aug 2023 21:55:09 UTC
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