From nobody Sat Jun 08 10:29:38 2024 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 4VxDpC2jrvz5NrZR; Sat, 08 Jun 2024 10:29:39 +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 4VxDpC0FlJz4nyd; Sat, 8 Jun 2024 10:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717842579; 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=j+ed4cwCvpYylCuoybJX80TiuEg1FpMjzslfMFthVJM=; b=gXcpCePuyYqOS5Hx3f3qJQJYg0os1O8sIV0A6HhwZzh3gWI2yrap349hPl3S7RLqNEdM6H mq90Zua0Hqr6EH4uPtz4GqraOfyUEM30cBBy3kq3RHSHJQ/dNpc1funK8Wuc+XxXcCSEtY mOEb0PgJpfQ3Rc5dw8j2bRzZ0MCV0ZylFyX1n3w/wsRPcWIfQq8nQfnydAbOkbG7JSyyRy /oRYNLGNUn/cL+3Zye8NoJ9BkbwLQIbgrC8K6cx891O5REvSocgTAblYEejWzcQKQuhb46 24/thixY2skxJ3ZM8DFctmDCRQLGSUrkZyN6aCywKXGis68qZwVhHkTFpMrkSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717842579; a=rsa-sha256; cv=none; b=yz9F8YEsuQbLiVGrtxnGUuZnGhFR1skEXaUexEXuJ/YZyTuV6D9emPGz3MnQItcd5dGHFq lguWd5d898tmHHycbgitov7IYEAWlkFe/MYbdNV+vt1Y5NFa4U0fMwOaFJ/M4G8KUpG6RH 12sQGRlfiGQL+n826DEs14kKMOTM9aBTiTjemvOyB/s4O4WBVjV/RRXb/Hc/0l6QwFJRq2 KhXHGNjFh7anyjMCd07opVrqqNVUcdUW6oiz2C65UfGvARTEtjonqmVWvm6/jAJbvU/Px8 xuHofvlEqT64cQAuxbRgxunT+XrKiHkiipU2+Dn6niy+R7brDYS+tINqaqIkxA== 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=1717842579; 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=j+ed4cwCvpYylCuoybJX80TiuEg1FpMjzslfMFthVJM=; b=KLM3nMPT2xPV/L1hAo8L+tfJyV5f+sWQmYo9VbHhll7G0Ezbcz/0ZH1L/mtSCRO4up8G7U W2ReZyBRLmX4ausFM3OPgB9rhzVkG7czxXPFqNo7gaQW7IzKy8xpIkAnMrnMFBHX2uK2nr S0949WAlrh6mcM1WquyqIxDn7WIVJC/XKebfcAjUAV6kn+OtT1Y/Z+H3i+3H422UZ+nARB Tp8uAytNJbWMzhtNbukC5AAToXefpugWV13tJ15CFZcOkmAGvq6cRWvjH9OHCXoQM265d9 Rw6YVwCJmtCdX6sykospxKOO4502IN6trdikVh04suSN15Fo8dx3j9pE4ThexQ== 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 4VxDpB6hyBzvZV; Sat, 8 Jun 2024 10:29:38 +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 458ATc4r067831; Sat, 8 Jun 2024 10:29:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 458ATcvr067828; Sat, 8 Jun 2024 10:29:38 GMT (envelope-from git) Date: Sat, 8 Jun 2024 10:29:38 GMT Message-Id: <202406081029.458ATcvr067828@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 143fa66a1a58 - main - www/nghttp2: Attempt to fix build on 13.2 and 14.0 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 143fa66a1a58f7c673e217c53dd5807075b72240 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=143fa66a1a58f7c673e217c53dd5807075b72240 commit 143fa66a1a58f7c673e217c53dd5807075b72240 Author: Daniel Engberg AuthorDate: 2024-06-08 10:21:56 +0000 Commit: Daniel Engberg CommitDate: 2024-06-08 10:28:30 +0000 www/nghttp2: Attempt to fix build on 13.2 and 14.0 Attempt to fix build failure introduced in 1.62.0 PR: 278965 Approved by: portmgr (blanket, build fix) --- www/nghttp2/Makefile | 11 +++++++++++ www/nghttp2/files/extra-patch-compatibility-fix | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile index cde21d14801d..54f0a124df23 100644 --- a/www/nghttp2/Makefile +++ b/www/nghttp2/Makefile @@ -43,6 +43,17 @@ HPACK_BUILD_DEPENDS= jansson>=2.5:devel/jansson HPACK_CMAKE_BOOL= ENABLE_HPACK_TOOLS HPACK_LIB_DEPENDS= libjansson.so:devel/jansson +.include + +.if ${OPSYS}_${OSREL:C/\\./-/} == FreeBSD_13-2 +USES+= llvm +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-compatibility-fix +.endif + +.if ${OPSYS}_${OSREL:C/\\./-/} == FreeBSD_14-0 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-compatibility-fix +.endif + post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/ ${INSTALL_DATA} ${FILESDIR}/nghttpx.conf.sample ${STAGEDIR}${PREFIX}/etc/nghttpx/nghttpx.conf.sample diff --git a/www/nghttp2/files/extra-patch-compatibility-fix b/www/nghttp2/files/extra-patch-compatibility-fix new file mode 100644 index 000000000000..932cc6aebff9 --- /dev/null +++ b/www/nghttp2/files/extra-patch-compatibility-fix @@ -0,0 +1,11 @@ +--- src/template.h.orig 2024-06-08 10:06:50 UTC ++++ src/template.h +@@ -444,7 +444,7 @@ inline constexpr bool operator==(const StringRef &lhs, + std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs)); + } + +-#ifndef __APPLE__ ++#ifndef __FreeBSD__ + inline constexpr std::strong_ordering + operator<=>(const StringRef &lhs, const StringRef &rhs) noexcept { + return std::lexicographical_compare_three_way(std::begin(lhs), std::end(lhs),