Index: branches/2021Q1/devel/folly/Makefile =================================================================== --- branches/2021Q1/devel/folly/Makefile (revision 567444) +++ branches/2021Q1/devel/folly/Makefile (revision 567445) @@ -1,46 +1,47 @@ # $FreeBSD$ PORTNAME= folly DISTVERSIONPREFIX= v DISTVERSION= 2020.12.28.00 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library developed and used at Facebook LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_FreeBSD_11= bug in folly, confusion with Jemalloc: https://github.com/facebook/folly/issues/1458 BROKEN_i386= error: use of undeclared identifier 'DCHECK': https://github.com/facebook/folly/issues/1168 LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ libdouble-conversion.so:devel/double-conversion \ libevent.so:devel/libevent \ libfmt.so:devel/libfmt \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ liblz4.so:archivers/liblz4 \ libsnappy.so:archivers/snappy \ libsodium.so:security/libsodium \ libunwind.so:devel/libunwind \ libzstd.so:archivers/zstd TEST_DEPENDS= googletest>0:devel/googletest USES= cmake compiler:c++17-lang ssl USE_GITHUB= yes GH_ACCOUNT= facebook USE_LDCONFIG= yes 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 CXXFLAGS+= -fPIC +CXXFLAGS_powerpc64= -DFOLLY_QUOTIENT_MULTI_SET_SUPPORTED=0 do-test: @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 Index: branches/2021Q1/devel/folly/files/patch-folly_experimental_QuotientMultiSet.h =================================================================== --- branches/2021Q1/devel/folly/files/patch-folly_experimental_QuotientMultiSet.h (nonexistent) +++ branches/2021Q1/devel/folly/files/patch-folly_experimental_QuotientMultiSet.h (revision 567445) @@ -0,0 +1,12 @@ +--- folly/experimental/QuotientMultiSet.h.orig 2021-03-06 00:00:24 UTC ++++ folly/experimental/QuotientMultiSet.h +@@ -26,7 +26,9 @@ + #include + + // A 128-bit integer type is needed for fast division. ++#ifndef FOLLY_QUOTIENT_MULTI_SET_SUPPORTED + #define FOLLY_QUOTIENT_MULTI_SET_SUPPORTED FOLLY_HAVE_INT128_T ++#endif + + #if FOLLY_QUOTIENT_MULTI_SET_SUPPORTED + Property changes on: branches/2021Q1/devel/folly/files/patch-folly_experimental_QuotientMultiSet.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 567444) +++ branches/2021Q1 (revision 567445) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r567444