diff --git a/devel/folly/Makefile b/devel/folly/Makefile index 71018bf5c15d..14fb4781a48a 100644 --- a/devel/folly/Makefile +++ b/devel/folly/Makefile @@ -1,56 +1,57 @@ PORTNAME= folly DISTVERSIONPREFIX= v DISTVERSION= 2024.10.28.00 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library developed and used at Facebook WWW= https://github.com/facebook/folly LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= error: use of undeclared identifier 'DCHECK': https://github.com/facebook/folly/issues/1168 BROKEN_powerpc= compilation fails: Big endian requires a redesigned table (assert in folly/detail/base64_detail/Base64SWAR.cpp:107) BROKEN_powerpc64= compilation fails: Big endian requires a redesigned table (assert in folly/detail/base64_detail/Base64SWAR.cpp:107) BUILD_DEPENDS= elfutils>0:devel/elfutils # workaround for missing symbols like DW_UT_compile: https://github.com/facebook/folly/issues/1654 BUILD_DEPENDS+= fast_float>0:math/fast_float LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ libbzip2.so:misc/vxl \ libdouble-conversion.so:devel/double-conversion \ libevent.so:devel/libevent \ libfmt.so:devel/libfmt \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libicui18n.so:devel/icu \ liblz4.so:archivers/liblz4 \ libsnappy.so:archivers/snappy \ libsodium.so:security/libsodium \ libunwind.so:devel/libunwind \ libzstd.so:archivers/zstd RUN_DEPENDS= elfutils>0:devel/elfutils # workaround for missing symbols like DW_UT_compile: https://github.com/facebook/folly/issues/1654 TEST_DEPENDS= googletest>0:devel/googletest USES= cmake compiler:c++17-lang cpe localbase ssl USE_LDCONFIG= yes CPE_VENDOR= facebook USE_GITHUB= yes GH_ACCOUNT= facebook CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= FREEBSD_BUILD_EXAMPLES FREEBSD_FOLLY_USE_SYMBOLIZER # enabling symbolizer causes undefined symbol _r_debug, see https://github.com/facebook/folly/issues/1373 #CMAKE_OFF+= FOLLY_USE_JEMALLOC # Build fails with FOLLY_USE_JEMALLOC=OFF, see https://github.com/facebook/folly/issues/1893 CXXFLAGS+= -fPIC CXXFLAGS+= -DGLOG_USE_GLOG_EXPORT CXXFLAGS_powerpc64= -DFOLLY_QUOTIENT_MULTI_SET_SUPPORTED=0 do-test: # tests fail to compile, see https://github.com/facebook/folly/issues/2246 @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include diff --git a/devel/folly/files/patch-folly_io_Cursor.h b/devel/folly/files/patch-folly_io_Cursor.h deleted file mode 100644 index f79053c883bc..000000000000 --- a/devel/folly/files/patch-folly_io_Cursor.h +++ /dev/null @@ -1,18 +0,0 @@ ---- folly/io/Cursor.h.orig 2024-09-07 03:24:18 UTC -+++ folly/io/Cursor.h -@@ -677,6 +677,7 @@ class CursorBase { - return ByteRange{data(), available}; - } - -+#if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 190000 - /** - * Alternate version of peekBytes() that returns a std::basic_string_view - * instead of a ByteRage. -@@ -687,6 +688,7 @@ class CursorBase { - auto bytes = peekBytes(); - return {bytes.data(), bytes.size()}; - } -+#endif // _LIBCPP_VERSION < 190000 - - /** - * Alternate version of peekBytes() that returns a std::pair