From nobody Sat Sep 16 06:09:39 2023 X-Original-To: dev-commits-ports-all@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 4RngdB3mhkz4tFYC; Sat, 16 Sep 2023 06:09:50 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mx2.catspoiler.org (mx2.catspoiler.org [IPv6:2607:f740:16::d18]) (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 (2048 bits) client-digest SHA256) (Client CN "amnesiac", Issuer "amnesiac" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rngd92M4fz3QQ1; Sat, 16 Sep 2023 06:09:49 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 2607:f740:16::d18 is neither permitted nor denied by domain of truckman@FreeBSD.org) smtp.mailfrom=truckman@FreeBSD.org; dmarc=none Received: from gw.catspoiler.org ([76.212.85.177]) by mx2.catspoiler.org (8.16.1/8.16.1) with ESMTPS id 38G68qwP076580 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=FAIL); Sat, 16 Sep 2023 06:08:53 GMT (envelope-from truckman@FreeBSD.org) Received-SPF: pass (gw.catspoiler.org: 192.168.101.2 is whitelisted) receiver=gw.catspoiler.org; client-ip=192.168.101.2; helo=mousie.catspoiler.org; envelope-from=truckman@FreeBSD.org; x-software=spfmilter 2.001 http://www.acme.com/software/spfmilter/ with libspf2-1.2.10; Received: from mousie.catspoiler.org (mousie.catspoiler.org [192.168.101.2]) by gw.catspoiler.org (8.16.1/8.16.1) with ESMTPS id 38G69eBb054677 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 15 Sep 2023 23:09:40 -0700 (PDT) (envelope-from truckman@FreeBSD.org) Date: Fri, 15 Sep 2023 23:09:39 -0700 (PDT) From: Don Lewis Subject: Re: git: dc226fe320b0 - main - devel/libepoll-shim: Fix build on 15 To: Muhammad Moinur Rahman , x11@FreeBSD.org cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org In-Reply-To: <202308252155.37PLt9lC031440@gitrepo.freebsd.org> Message-ID: References: <202308252155.37PLt9lC031440@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=us-ascii Content-Disposition: INLINE X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.88)[-0.884]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_FIVE(0.00)[5]; MLMMJ_DEST(0.00)[x11@FreeBSD.org,dev-commits-ports-all@FreeBSD.org,dev-commits-ports-main@FreeBSD.org]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:36236, ipnet:2607:f740:16::/48, country:US]; MIME_TRACE(0.00)[0:+]; R_SPF_SOFTFAIL(0.00)[~all]; MID_RHS_MATCH_FROM(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[truckman]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4Rngd92M4fz3QQ1 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 > 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 > 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 Stop. make: stopped in /usr/ports/devel/libepoll-shim # uname -a FreeBSD 14STABLEamd64-quarterly 14.0-STABLE FreeBSD 14.0-STABLE 1400500 amd64 %git status On branch 2023Q3 Your branch is up to date with 'origin/2023Q3'. nothing to commit, working tree clean zipper:ports.quarterly 374%git log | head -1 commit c7f684191701882ba88ded6b8138ed964b539fb3 If I cherry-pick this commit, the build succeeds: ====> 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 ===> No pkg-plist issues found (check-plist) =>> Checking for staging violations... done =================================================== ===> Building package for libepoll-shim-0.0.20230411 =========================================================================== =>> Recording filesystem state for preinst... done ===================================================