aboutsummaryrefslogtreecommitdiff
path: root/net/fb303
diff options
context:
space:
mode:
Diffstat (limited to 'net/fb303')
-rw-r--r--net/fb303/Makefile16
-rw-r--r--net/fb303/distinfo6
-rw-r--r--net/fb303/files/patch-build_fbcode__builder_CMake_FBThriftLibrary.cmake2
-rw-r--r--net/fb303/files/patch-fb303_thrift_CMakeLists.txt22
-rw-r--r--net/fb303/pkg-plist4
5 files changed, 19 insertions, 31 deletions
diff --git a/net/fb303/Makefile b/net/fb303/Makefile
index ef9420755feb..0c5bff9aba4b 100644
--- a/net/fb303/Makefile
+++ b/net/fb303/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fb303
-DISTVERSION= g20200915
+DISTVERSION= g20201122
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
@@ -11,23 +11,31 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
+ libdouble-conversion.so:devel/double-conversion \
+ libevent.so:devel/libevent \
libfizz.so:security/fizz \
libfmt.so:devel/libfmt \
libfolly.so:devel/folly \
libgflags.so:devel/gflags \
libglog.so:devel/glog \
+ liblz4.so:archivers/liblz4 \
+ libsnappy.so:archivers/snappy \
+ libsodium.so:security/libsodium \
libthriftcpp2.so:devel/fbthrift \
- libwangle.so:net/wangle
+ libunwind.so:devel/libunwind \
+ libwangle.so:net/wangle \
+ libzstd.so:archivers/zstd
-USES= cmake compiler:c++17-lang
+USES= cmake compiler:c++17-lang ssl
USE_GITHUB= yes
GH_ACCOUNT= facebook
-GH_TAGNAME= ec43a43
+GH_TAGNAME= 94cac88
USE_LDCONFIG= yes
CXXFLAGS+= -fPIC
CMAKE_ON= BUILD_SHARED_LIBS
+CMAKE_OFF= PYTHON_EXTENSIONS
post-install:
@${RMDIR} ${STAGEDIR}${PREFIX}/include/fb303/test
diff --git a/net/fb303/distinfo b/net/fb303/distinfo
index edd905e291d0..656cdfc290b6 100644
--- a/net/fb303/distinfo
+++ b/net/fb303/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600206657
-SHA256 (facebook-fb303-g20200915-ec43a43_GH0.tar.gz) = 956c7388d59a73c381627a8a67c57726994b28252b8246f224e94041cec0aaed
-SIZE (facebook-fb303-g20200915-ec43a43_GH0.tar.gz) = 224086
+TIMESTAMP = 1606084796
+SHA256 (facebook-fb303-g20201122-94cac88_GH0.tar.gz) = fce85a3f00800953a0ed06ee524a7f45e49aadd26d0bd7851cdb7682e6e195b0
+SIZE (facebook-fb303-g20201122-94cac88_GH0.tar.gz) = 230527
diff --git a/net/fb303/files/patch-build_fbcode__builder_CMake_FBThriftLibrary.cmake b/net/fb303/files/patch-build_fbcode__builder_CMake_FBThriftLibrary.cmake
index bee37e4a7901..8f1c53446ba1 100644
--- a/net/fb303/files/patch-build_fbcode__builder_CMake_FBThriftLibrary.cmake
+++ b/net/fb303/files/patch-build_fbcode__builder_CMake_FBThriftLibrary.cmake
@@ -1,4 +1,4 @@
---- build/fbcode_builder/CMake/FBThriftLibrary.cmake.orig 2020-09-15 21:55:13 UTC
+--- build/fbcode_builder/CMake/FBThriftLibrary.cmake.orig 2020-11-22 22:29:00 UTC
+++ build/fbcode_builder/CMake/FBThriftLibrary.cmake
@@ -43,7 +43,7 @@ function(add_fbthrift_library LIB_NAME THRIFT_FILE)
set(PY_DEPENDS)
diff --git a/net/fb303/files/patch-fb303_thrift_CMakeLists.txt b/net/fb303/files/patch-fb303_thrift_CMakeLists.txt
deleted file mode 100644
index 07717fcee34b..000000000000
--- a/net/fb303/files/patch-fb303_thrift_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
---- fb303/thrift/CMakeLists.txt.orig 2020-09-15 21:56:05 UTC
-+++ fb303/thrift/CMakeLists.txt
-@@ -15,7 +15,7 @@
- add_fbthrift_library(
- fb303_thrift
- fb303_core.thrift
-- LANGUAGES cpp py
-+ LANGUAGES cpp
- THRIFT_INCLUDE_DIR "${INCLUDE_INSTALL_DIR}/thrift-files"
- SERVICES
- BaseService
-@@ -38,8 +38,10 @@ install(
- DESTINATION "$<TARGET_PROPERTY:fb303_thrift_cpp,THRIFT_INSTALL_DIR>"
- )
-
-+if (FALSE)
- install_fb_python_library(fb303_thrift_py EXPORT fb303-exports)
- install(
- TARGETS fb303_thrift_py.thrift_includes
- EXPORT fb303-exports
- )
-+endif()
diff --git a/net/fb303/pkg-plist b/net/fb303/pkg-plist
index 73689d03b31b..de3f65a73c49 100644
--- a/net/fb303/pkg-plist
+++ b/net/fb303/pkg-plist
@@ -46,4 +46,6 @@ lib/cmake/fb303/fb303-config.cmake
lib/cmake/fb303/fb303-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/fb303/fb303-targets.cmake
lib/libfb303.so
-lib/libfb303_thrift_cpp.a
+lib/libfb303.so.1.0.0
+lib/libfb303_thrift_cpp.so
+lib/libfb303_thrift_cpp.so.1.0.0