diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
index 7cdd743db759..48877f5bcffe 100644
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -1,48 +1,45 @@
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION} # to keep in sync with thrift
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
 PKGNAMESUFFIX=	-cpp
 DISTNAME=	thrift-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ interface to Thrift
 WWW=		https://thrift.apache.org/
 
-BROKEN_i386=	undefined reference to 'boost::atomics::detail::lockpool::scoped_lock::scoped_lock(void const volatile*)'
-
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libevent.so:devel/libevent
 
 USES=			bison cmake pkgconfig compiler:c++11-lang cpe \
 			pathfix ssl
 CPE_VENDOR=		apache
 USE_LDCONFIG=		yes
 
 CMAKE_ON=		BUILD_CPP
 CMAKE_OFF=		BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL BUILD_TESTING
 
-MAKE_JOBS_UNSAFE=	yes
 DISTINFO_FILE=		${.CURDIR}/../thrift/distinfo
 PLIST_SUB=		PORTVERSION="${THRIFT_PORTVERSION}"
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 USE_CXXSTD=	c++11
 .endif
 
 .if ${SSL_DEFAULT} != base
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so
 	${LN} -sf libthrift-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthrift.so.0
 	${LN} -sf libthriftnb-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftnb.so.0
 	${LN} -sf libthriftz-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftz.so.0
 
 .include "../thrift/bsd.thrift.mk"
 .include <bsd.port.post.mk>
diff --git a/devel/thrift-cpp/files/patch-lib_cpp_src_thrift_protocol_TProtocol.h b/devel/thrift-cpp/files/patch-lib_cpp_src_thrift_protocol_TProtocol.h
new file mode 100644
index 000000000000..f5f1d9cb381a
--- /dev/null
+++ b/devel/thrift-cpp/files/patch-lib_cpp_src_thrift_protocol_TProtocol.h
@@ -0,0 +1,11 @@
+--- lib/cpp/src/thrift/protocol/TProtocol.h.orig	2025-08-24 09:28:32 UTC
++++ lib/cpp/src/thrift/protocol/TProtocol.h
+@@ -146,7 +146,7 @@ static inline To bitwise_cast(From from) {
+ #  define THRIFT_ntohll(n) (n)
+ #  define THRIFT_htonll(n) (n)
+ # endif
+-# if defined(__GNUC__) && defined(__GLIBC__)
++# if defined(__GNUC__)
+ #  include <byteswap.h>
+ #  define THRIFT_htolell(n) bswap_64(n)
+ #  define THRIFT_letohll(n) bswap_64(n)