git: 3bfd18f3e30f - main - devel/folly: Update 2022.11.14.00 -> 2022.11.28.00

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Tue, 29 Nov 2022 09:19:33 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3bfd18f3e30fa920485027feaddf66e0cc15b37a

commit 3bfd18f3e30fa920485027feaddf66e0cc15b37a
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-11-29 04:13:52 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-11-29 09:18:44 +0000

    devel/folly: Update 2022.11.14.00 -> 2022.11.28.00
---
 devel/folly/Makefile                                        |  4 +++-
 devel/folly/distinfo                                        |  6 +++---
 devel/folly/files/patch-folly_executors_QueueObserver.h     |  8 ++++----
 .../files/patch-folly_logging_test_AsyncFileWriterTest.cpp  | 13 +++++++++++++
 .../patch-folly_logging_test_ImmediateFileWriterTest.cpp    | 13 +++++++++++++
 devel/folly/pkg-plist                                       |  6 ++++--
 6 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/devel/folly/Makefile b/devel/folly/Makefile
index fe630354a75f..9940469b21e0 100644
--- a/devel/folly/Makefile
+++ b/devel/folly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2022.11.14.00
+DISTVERSION=	2022.11.28.00
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,6 +14,7 @@ BROKEN_i386=	error: use of undeclared identifier 'DCHECK': https://github.com/fa
 
 BUILD_DEPENDS=	elfutils>0:devel/elfutils # workaround for missing symbols like DW_UT_compile: https://github.com/facebook/folly/issues/1654
 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 \
@@ -37,6 +38,7 @@ 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_powerpc64=	-DFOLLY_QUOTIENT_MULTI_SET_SUPPORTED=0
diff --git a/devel/folly/distinfo b/devel/folly/distinfo
index a0f3d687ff3a..9d7cea93ea07 100644
--- a/devel/folly/distinfo
+++ b/devel/folly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668572917
-SHA256 (facebook-folly-v2022.11.14.00_GH0.tar.gz) = b249436cb61b6dfd5288093565438d8da642b07ae021191a4042b221bc1bdc0e
-SIZE (facebook-folly-v2022.11.14.00_GH0.tar.gz) = 3751417
+TIMESTAMP = 1669653123
+SHA256 (facebook-folly-v2022.11.28.00_GH0.tar.gz) = 03ab9b889fca5b31064900e817fdcaecefa6dd1b2c36a1fd8dbd4a003cb6f816
+SIZE (facebook-folly-v2022.11.28.00_GH0.tar.gz) = 3762276
diff --git a/devel/folly/files/patch-folly_executors_QueueObserver.h b/devel/folly/files/patch-folly_executors_QueueObserver.h
index 39963f950316..93aa3e840f4c 100644
--- a/devel/folly/files/patch-folly_executors_QueueObserver.h
+++ b/devel/folly/files/patch-folly_executors_QueueObserver.h
@@ -1,10 +1,10 @@
 - workaround for https://github.com/facebook/folly/issues/1637
 
---- folly/executors/QueueObserver.h.orig	2021-08-26 23:37:53 UTC
+--- folly/executors/QueueObserver.h.orig	2022-11-25 05:13:23 UTC
 +++ folly/executors/QueueObserver.h
-@@ -23,6 +23,8 @@
- 
- #include <folly/Portability.h>
+@@ -26,6 +26,8 @@
+ #include <folly/Synchronized.h>
+ #include <folly/portability/SysTypes.h>
  
 +#include <signal.h>
 +
diff --git a/devel/folly/files/patch-folly_logging_test_AsyncFileWriterTest.cpp b/devel/folly/files/patch-folly_logging_test_AsyncFileWriterTest.cpp
new file mode 100644
index 000000000000..5deadb55d822
--- /dev/null
+++ b/devel/folly/files/patch-folly_logging_test_AsyncFileWriterTest.cpp
@@ -0,0 +1,13 @@
+- workaround for https://github.com/facebook/folly/issues/1866
+
+--- folly/logging/test/AsyncFileWriterTest.cpp.orig	2022-11-25 05:13:23 UTC
++++ folly/logging/test/AsyncFileWriterTest.cpp
+@@ -45,6 +45,8 @@
+ #include <folly/system/ThreadName.h>
+ #include <folly/test/TestUtils.h>
+ 
++#include <sys/wait.h>
++
+ DEFINE_int64(
+     async_discard_num_normal_writers,
+     30,
diff --git a/devel/folly/files/patch-folly_logging_test_ImmediateFileWriterTest.cpp b/devel/folly/files/patch-folly_logging_test_ImmediateFileWriterTest.cpp
new file mode 100644
index 000000000000..d7a77086b777
--- /dev/null
+++ b/devel/folly/files/patch-folly_logging_test_ImmediateFileWriterTest.cpp
@@ -0,0 +1,13 @@
+- workaround for https://github.com/facebook/folly/issues/1865
+
+--- folly/logging/test/ImmediateFileWriterTest.cpp.orig	2022-11-25 05:13:23 UTC
++++ folly/logging/test/ImmediateFileWriterTest.cpp
+@@ -30,6 +30,8 @@
+ #include <folly/portability/GMock.h>
+ #include <folly/portability/GTest.h>
+ 
++#include <signal.h>
++
+ using namespace folly;
+ using folly::test::TemporaryFile;
+ 
diff --git a/devel/folly/pkg-plist b/devel/folly/pkg-plist
index 595b75c936fb..6fa0c33a6adf 100644
--- a/devel/folly/pkg-plist
+++ b/devel/folly/pkg-plist
@@ -311,10 +311,10 @@ include/folly/experimental/channels/Transform.h
 include/folly/experimental/channels/detail/AtomicQueue.h
 include/folly/experimental/channels/detail/ChannelBridge.h
 include/folly/experimental/channels/detail/FunctionTraits.h
+include/folly/experimental/channels/detail/IntrusivePtr.h
 include/folly/experimental/channels/detail/MultiplexerTraits.h
 include/folly/experimental/channels/detail/PointerVariant.h
 include/folly/experimental/channels/detail/Utility.h
-include/folly/experimental/channels/detail/IntrusivePtr.h
 include/folly/experimental/coro/Accumulate-inl.h
 include/folly/experimental/coro/Accumulate.h
 include/folly/experimental/coro/AsyncGenerator.h
@@ -348,6 +348,7 @@ include/folly/experimental/coro/RustAdaptors.h
 include/folly/experimental/coro/ScopeExit.h
 include/folly/experimental/coro/SharedLock.h
 include/folly/experimental/coro/SharedMutex.h
+include/folly/experimental/coro/SharedPromise.h
 include/folly/experimental/coro/Sleep-inl.h
 include/folly/experimental/coro/Sleep.h
 include/folly/experimental/coro/SmallUnboundedQueue.h
@@ -389,9 +390,9 @@ include/folly/experimental/io/AsyncIoUringSocketFactory.h
 include/folly/experimental/io/FsUtil.h
 include/folly/experimental/io/HugePages.h
 include/folly/experimental/io/IoUring.h
+include/folly/experimental/io/IoUringBackend.h
 include/folly/experimental/io/IoUringEvent.h
 include/folly/experimental/io/IoUringEventBaseLocal.h
-include/folly/experimental/io/IoUringBackend.h
 include/folly/experimental/io/SimpleAsyncIO.h
 include/folly/experimental/observer/Observable-inl.h
 include/folly/experimental/observer/Observable.h
@@ -534,6 +535,7 @@ include/folly/io/async/AsyncSignalHandler.h
 include/folly/io/async/AsyncSocket.h
 include/folly/io/async/AsyncSocketBase.h
 include/folly/io/async/AsyncSocketException.h
+include/folly/io/async/AsyncSocketTransport.h
 include/folly/io/async/AsyncTimeout.h
 include/folly/io/async/AsyncTransport.h
 include/folly/io/async/AsyncTransportCertificate.h