From owner-dev-commits-ports-main@freebsd.org Wed May 19 10:41:04 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 254E563DEC4; Wed, 19 May 2021 10:41:04 +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 4FlTtS08vrz4RX9; Wed, 19 May 2021 10:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E268611436; Wed, 19 May 2021 10:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14JAf3T3047149; Wed, 19 May 2021 10:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14JAf3x2047148; Wed, 19 May 2021 10:41:03 GMT (envelope-from git) Date: Wed, 19 May 2021 10:41:03 GMT Message-Id: <202105191041.14JAf3x2047148@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 56986abc6d4b - main - www/trafficserver: fix build on ≥ 13 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56986abc6d4bac9c6e636cdc9f93075be5b95299 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2021 10:41:04 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=56986abc6d4bac9c6e636cdc9f93075be5b95299 commit 56986abc6d4bac9c6e636cdc9f93075be5b95299 Author: Dmitry Marakasov AuthorDate: 2021-05-18 14:29:02 +0000 Commit: Dmitry Marakasov CommitDate: 2021-05-19 10:36:06 +0000 www/trafficserver: fix build on ≥ 13 Approved by: portmgr blanket --- www/trafficserver/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile index 5fa789f3e263..88412cdfd98f 100644 --- a/www/trafficserver/Makefile +++ b/www/trafficserver/Makefile @@ -87,6 +87,14 @@ USE_GCC= yes PLIST_SUB+= WCCP="@comment " .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 +# On FreeBSD >= 12 it does find eventfd.h, but it makes it also use +# sys/epoll.h which is absent on FreeBSD and the build fails. So make +# it ignore eventfd.h to build as on 11.x. Better solution would probably +# be to depend on epoll-shim, but that needs testing +CONFIGURE_ARGS+= ac_cv_header_sys_eventfd_h=no ac_cv_func_eventfd=no +.endif + post-patch: @${REINPLACE_CMD} \ -e '/cachedir:/s,$${localstatedir}+,$${localstatedir}/cache+,' \