From nobody Sat Sep 16 06:47:20 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 4RnhSY2vhpz4tQhG; Sat, 16 Sep 2023 06:47:25 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnhSY2TC9z3WYm; Sat, 16 Sep 2023 06:47:25 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694846845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JwTpZyX5DDGH8W/QCK4axIyShaL23x2qpNNQzROfrpA=; b=gRiJkyBzhU1DAegdSYtYvG0hJdRPMshYJEzN6AwZ8aDiqFS0n+bCnoL3iXx4Yob3jASGM/ zko/LugH9fIbkStsxwubWd7UbdUSdsTBG0JQ2zJHHgXHZo17enguZEkgDviSEciyVDkFn0 hCrx9OC2l9IqfCx8DLpSD4xGn+wXumbyml5ZTB+8OTvW/Drt/EbL2sXcr+++gmDHWtv5HL mA5dOh+wpp9o17vFtVF9EGwOe0LQsuVPW7IHaJWn/uY/eYWTmRszuIbvrrDE9e1ilDUfRr Qa9YEo3DcU5ldosajSnYFCKnseMiFLkWz2DM0A1RNghJ/9HjHXVqxyFs9p9pbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694846845; a=rsa-sha256; cv=none; b=WNDljVaWVIzlgZMuTqEo6dUAV+AwVVVK+aqEB7PqP4DO7XcQbUPrUpTybyW+HrC232uG5H lgwGX6UH7HoD70LcZ6NiWpkC44BtJ3PDR/AzgGdnvzI4Hk8El6djflel+dYySwZwrea4J3 e11kxWXWc/2ODMJ1oSJO4OmfLi5dOZb5YoS6EgvV9lJS+/DpEGYWOGRRfHTG9eNgf1Fr6M 14//VGep8Ez8bIwpWvt1WsdX+VdpdLpnGPe2Bb/DyHx4860kU0rFHy4d/ZlkIH4E7nM3QN jK2/U6vQOkn/2myrj10/nkslw99bx42NnB/7IPbYF47X4pkvEfogvTJm4BgxIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694846845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JwTpZyX5DDGH8W/QCK4axIyShaL23x2qpNNQzROfrpA=; b=EfxPh9U5CFGEA4N1rtQY/Fzgt3Epm06nKLr2xzrCkMTplIc28qWmW7sfZ0Tyonscy/EzXZ T8TkjwlXtI9zR1sXWKWMg6/VL/ecQtW8R51Iddfr61YTDFOs2PdSHmfwavmOzLJx1UTead tmwO0+Dhg1/FEiOg1LgDAOXhYwPUsF+0ySdBug0Gf6kuP/QMLASuHLdFXxS9K2szE7+BWE pu+seQ8IUdSiMwOb3zs84ZTsOcWa2Hh6wzttOKAR32+35c9wGDo8pSMDHb71GTldNlPKhQ j26/Ap46XmBw7ovxVigUabjIO8mvxrjFTqEgiPi8iOquV7f1fa0khmJ783iiyA== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 41E9311A34; Sat, 16 Sep 2023 06:47:25 +0000 (UTC) From: Jan Beich To: Don Lewis Cc: Muhammad Moinur Rahman , 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 In-Reply-To: (Don Lewis's message of "Fri, 15 Sep 2023 23:09:39 -0700 (PDT)") References: <202308252155.37PLt9lC031440@gitrepo.freebsd.org> Date: Sat, 16 Sep 2023 08:47:20 +0200 Message-ID: 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 Don Lewis 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 >> 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 -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.