From nobody Fri Aug 25 21:55:09 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RXYf63y1dz4qrZW; Fri, 25 Aug 2023 21:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RXYf623TQz4DSV; Fri, 25 Aug 2023 21:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693000510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7XD80/G4dRbyY8QY7DN2gmMwCSG+4gLW8iWUHjvKRHA=; b=Ro6gBJfMg0bK+riUunZJNz77urvr2kNZXAqRd8hbYOPrHeEEQLslDd+ygwXnz05ug6AVhi Q2yQqNBdFTeUDQod7/2bPW5PoDfmrsTN9UyeYyOWQl7dlEhFvZP0IEORF9htyawgBsvJvA Qq1/9ynR5viQKN4qPR0M1uJ6Rb0cmqYnFjFRXRQxMfMXOmOW6tEoHjY4POWfX3scxsGdJB xZ+Q7stwwL3FBLClUZEFSSlgj8cCUrCzxDS4wRQIN8ENXwvIL2cfNs2CLoe6SRaNxmthFj ZrWHgHma5SgzupjKfKQ4GQrJYvVk0DX6oJx2wXlqKRRf58X6T04ma9PA6TOEnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693000510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7XD80/G4dRbyY8QY7DN2gmMwCSG+4gLW8iWUHjvKRHA=; b=WbUOCayIxQwiUi8lw2A/KZ8ndCeneuVSbAVfAojZbyl8xcJzwTkCBUp5QDk5Gj4hioyzjT dEUdbBQqqQzusPlQvd58uHT0GkSI1ijFGcN7YYi8ANYD1rJuf5OvCoziVI/ZxVtTeWGHLz thnBqqtd2RO08SjSWIyTpHNenwPlJjRJJ54c2SfAj/vwbUQ8YOD/niccxjpUTIuEhzSPbN hbMg6qiNj1IcRef6ynhI4Eu1p2RNaaNTDih1MdAULqGrMeCkST22ipTJsrOvlXe0G5mxWY clCJMRn3Ve5iHfnZksK7833FhlZ4yuU1v2+FMOQ2MNDIVCVrIjDzje7WBKwEgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693000510; a=rsa-sha256; cv=none; b=p3uTxHrk3/vhUSnaSFrBP9njaC4QMr5sDVReXqLHcFLTGvBCzdur/yCksvPHFOBI4BUAf6 7jctElIzAAV5eSLMRrSPQY3WzBK30sD7NoeMgLFsNLK2dnLWgj6ri2hBl/Mb7G/IfvRzIm tiTc98iKIZw1r44/WIcA7zyOX2yLkzxX6EuFno+uEGNtY6LhiBKvXIQ7cGqeINCABcdoH4 lEFQEyEdOr6CSKWFICqd5YQs2pmZBe3Q/1DjNIraHJTIarFWpT5vlQZOfXBUPnRThdQIOm nThNgItwfj9/OO6p35O2AZVpYx59C7gkBF/LXkI5QrsVsKJMIk9LuVNu8pdFjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RXYf601qbz1Nk8; Fri, 25 Aug 2023 21:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PLt93m031443; Fri, 25 Aug 2023 21:55:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PLt9lC031440; Fri, 25 Aug 2023 21:55:09 GMT (envelope-from git) Date: Fri, 25 Aug 2023 21:55:09 GMT Message-Id: <202308252155.37PLt9lC031440@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: dc226fe320b0 - main - devel/libepoll-shim: Fix build on 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc226fe320b057e8d8ab3975cd2044340a5b47e0 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc226fe320b057e8d8ab3975cd2044340a5b47e0 commit dc226fe320b057e8d8ab3975cd2044340a5b47e0 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-25 09:49:23 +0000 Commit: Muhammad Moinur Rahman 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