Skip to content

Commit

Permalink
www/nghttp2: Attempt to fix build on 13.2 and 14.0
Browse files Browse the repository at this point in the history
Attempt to fix build failure introduced in 1.62.0

PR:		278965
Approved by:	portmgr (blanket, build fix)
  • Loading branch information
Daniel Engberg authored and Daniel Engberg committed Jun 8, 2024
1 parent b9a2ee3 commit 143fa66
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
11 changes: 11 additions & 0 deletions www/nghttp2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <bsd.port.options.mk>

.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
Expand Down
11 changes: 11 additions & 0 deletions www/nghttp2/files/extra-patch-compatibility-fix
Original file line number Diff line number Diff line change
@@ -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),

0 comments on commit 143fa66

Please sign in to comment.