git: 0b31e9bab55d - main - devel/folly: Update 2023.06.12.00 → 2023.06.26.00

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sat, 01 Jul 2023 03:18:01 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b31e9bab55d4d68dec2e6d0ca4927de1c6e72bf

commit 0b31e9bab55d4d68dec2e6d0ca4927de1c6e72bf
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-07-01 03:17:37 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-07-01 03:17:55 +0000

    devel/folly: Update 2023.06.12.00 → 2023.06.26.00
---
 devel/folly/Makefile                                        |  7 +++++--
 devel/folly/distinfo                                        |  8 +++++---
 devel/folly/files/patch-folly_experimental_symbolizer_Elf.h | 12 ------------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/devel/folly/Makefile b/devel/folly/Makefile
index 5d97d847b760..f2fdf35ed43c 100644
--- a/devel/folly/Makefile
+++ b/devel/folly/Makefile
@@ -1,8 +1,11 @@
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2023.06.12.00
+DISTVERSION=	2023.06.26.00
 CATEGORIES=	devel
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	e74fe5c99dd9d96b80b17f8396ce2568f2becb45.diff:-p1 # fix https://github.com/facebook/folly/issues/2019
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library developed and used at Facebook
 WWW=		https://github.com/facebook/folly
@@ -43,7 +46,7 @@ CMAKE_OFF=	FREEBSD_BUILD_EXAMPLES FREEBSD_FOLLY_USE_SYMBOLIZER # enabling symbol
 CXXFLAGS+=	-fPIC
 CXXFLAGS_powerpc64=	-DFOLLY_QUOTIENT_MULTI_SET_SUPPORTED=0
 
-do-test:
+do-test: # tests fail to compile, see https://github.com/facebook/folly/issues/2032
 	@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} && \
diff --git a/devel/folly/distinfo b/devel/folly/distinfo
index b7f2970ad6e3..fbdeb48626ff 100644
--- a/devel/folly/distinfo
+++ b/devel/folly/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1686966150
-SHA256 (facebook-folly-v2023.06.12.00_GH0.tar.gz) = cb7d075f5610dcc50084d727ee675daad51733b049f0b07cc112b160e468599d
-SIZE (facebook-folly-v2023.06.12.00_GH0.tar.gz) = 3853096
+TIMESTAMP = 1688173429
+SHA256 (facebook-folly-v2023.06.26.00_GH0.tar.gz) = e7b58bf4eda24e2069b301e27533deb7c171dac57925cb90fe344595522772f3
+SIZE (facebook-folly-v2023.06.26.00_GH0.tar.gz) = 3859868
+SHA256 (e74fe5c99dd9d96b80b17f8396ce2568f2becb45.diff) = 19e50ddc436ee0bbdc759cfb0a4ebfd617ef9594a8c01eedb303e1fa26e9618c
+SIZE (e74fe5c99dd9d96b80b17f8396ce2568f2becb45.diff) = 652
diff --git a/devel/folly/files/patch-folly_experimental_symbolizer_Elf.h b/devel/folly/files/patch-folly_experimental_symbolizer_Elf.h
deleted file mode 100644
index f9386080ca1b..000000000000
--- a/devel/folly/files/patch-folly_experimental_symbolizer_Elf.h
+++ /dev/null
@@ -1,12 +0,0 @@
-- workaround for https://github.com/facebook/folly/issues/2015
-
---- folly/experimental/symbolizer/Elf.h.orig	2023-06-10 21:06:02 UTC
-+++ folly/experimental/symbolizer/Elf.h
-@@ -25,6 +25,7 @@
- #include <initializer_list>
- #include <stdexcept>
- #include <system_error>
-+#include <unordered_map>
- #include <unordered_set>
- 
- #include <folly/Conv.h>