Index: head/devel/folly/Makefile =================================================================== --- head/devel/folly/Makefile (revision 504358) +++ head/devel/folly/Makefile (revision 504359) @@ -1,34 +1,40 @@ # $FreeBSD$ PORTNAME= folly DISTVERSIONPREFIX= v DISTVERSION= 2019.06.10.00 +PORTREVISION= 1 CATEGORIES= devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= 2461dea6d517515ebea623d162722910ede5e86f.patch:-p1 + MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library developed and used at Facebook LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE + +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 \ 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 USES= cmake compiler:c++17-lang ssl USE_GITHUB= yes GH_ACCOUNT= facebook USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS CXXFLAGS+= -fPIC .include Index: head/devel/folly/distinfo =================================================================== --- head/devel/folly/distinfo (revision 504358) +++ head/devel/folly/distinfo (revision 504359) @@ -1,3 +1,5 @@ TIMESTAMP = 1560670033 SHA256 (facebook-folly-v2019.06.10.00_GH0.tar.gz) = afecd68815a83865d95a3a6b861abe8096beefae45c89566e0d510279b631b57 SIZE (facebook-folly-v2019.06.10.00_GH0.tar.gz) = 2941638 +SHA256 (2461dea6d517515ebea623d162722910ede5e86f.patch) = eb55e3d3c696abfcb0f0e45e49e92df0772533b6eb62480187d72658291c8cae +SIZE (2461dea6d517515ebea623d162722910ede5e86f.patch) = 4996 Index: head/devel/folly/files/patch-folly_experimental_EnvUtil.cpp =================================================================== --- head/devel/folly/files/patch-folly_experimental_EnvUtil.cpp (revision 504358) +++ head/devel/folly/files/patch-folly_experimental_EnvUtil.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- folly/experimental/EnvUtil.cpp.orig 2019-06-16 07:49:05 UTC -+++ folly/experimental/EnvUtil.cpp -@@ -27,6 +27,7 @@ using namespace folly::experimental; - - EnvironmentState EnvironmentState::fromCurrentEnvironment() { - std::unordered_map data; -+ extern char **environ; - for (auto it = environ; it && *it; ++it) { - std::string key, value; - folly::StringPiece entry(*it); Property changes on: head/devel/folly/files/patch-folly_experimental_EnvUtil.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/folly/files/patch-folly_portability_Stdlib.cpp =================================================================== --- head/devel/folly/files/patch-folly_portability_Stdlib.cpp (revision 504358) +++ head/devel/folly/files/patch-folly_portability_Stdlib.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- folly/portability/Stdlib.cpp.orig 2019-06-16 07:44:30 UTC -+++ folly/portability/Stdlib.cpp -@@ -149,6 +149,7 @@ int unsetenv(const char* name) { - - extern "C" int clearenv() { - std::vector data; -+ extern char **environ; - for (auto it = environ; it && *it; ++it) { - std::string entry(*it); - auto equalsPosition = entry.find('='); Property changes on: head/devel/folly/files/patch-folly_portability_Stdlib.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/folly/files/patch-folly_Memory.h =================================================================== --- head/devel/folly/files/patch-folly_Memory.h (revision 504358) +++ head/devel/folly/files/patch-folly_Memory.h (nonexistent) @@ -1,12 +0,0 @@ ---- folly/Memory.h.orig 2019-06-16 07:33:44 UTC -+++ folly/Memory.h -@@ -57,7 +57,8 @@ inline void deallocateBytes(void* p, size_t n) { - (defined(__ANDROID__) && (__ANDROID_API__ > 16)) || \ - (defined(__APPLE__) && \ - (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_6 || \ -- __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_0)) -+ __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_0)) || \ -+ defined(__FreeBSD__) - - inline void* aligned_malloc(size_t size, size_t align) { - // use posix_memalign, but mimic the behaviour of memalign Property changes on: head/devel/folly/files/patch-folly_Memory.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/folly/files/patch-folly_portability_Malloc.h =================================================================== --- head/devel/folly/files/patch-folly_portability_Malloc.h (revision 504358) +++ head/devel/folly/files/patch-folly_portability_Malloc.h (nonexistent) @@ -1,11 +0,0 @@ ---- folly/portability/Malloc.h.orig 2019-06-16 07:29:29 UTC -+++ folly/portability/Malloc.h -@@ -26,7 +26,7 @@ - // malloc_usable_size, and that's what we should be using. - #include // @manual - #else --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #endif - Property changes on: head/devel/folly/files/patch-folly_portability_Malloc.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/folly/files/patch-folly_portability_SysSyscall.h =================================================================== --- head/devel/folly/files/patch-folly_portability_SysSyscall.h (revision 504358) +++ head/devel/folly/files/patch-folly_portability_SysSyscall.h (nonexistent) @@ -1,11 +0,0 @@ ---- folly/portability/SysSyscall.h.orig 2019-06-16 07:32:11 UTC -+++ folly/portability/SysSyscall.h -@@ -21,6 +21,8 @@ - - #if defined(__APPLE__) - #define FOLLY_SYS_gettid SYS_thread_selfid -+#elif defined(__FreeBSD__) -+#define FOLLY_SYS_gettid SYS_thr_self - #elif defined(SYS_gettid) - #define FOLLY_SYS_gettid SYS_gettid - #else Property changes on: head/devel/folly/files/patch-folly_portability_SysSyscall.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/folly/files/patch-folly_Subprocess.cpp =================================================================== --- head/devel/folly/files/patch-folly_Subprocess.cpp (revision 504358) +++ head/devel/folly/files/patch-folly_Subprocess.cpp (nonexistent) @@ -1,27 +0,0 @@ ---- folly/Subprocess.cpp.orig 2019-06-16 07:47:17 UTC -+++ folly/Subprocess.cpp -@@ -24,6 +24,7 @@ - #include - #endif - #include -+#include - - #include - #include -@@ -394,6 +395,7 @@ void Subprocess::spawnInternal( - envHolder = cloneStrings(*env); - envVec = const_cast(envHolder.get()); - } else { -+ extern char **environ; - envVec = environ; - } - -@@ -557,7 +559,7 @@ int Subprocess::prepareChild( - #endif - - if (options.processGroupLeader_) { -- if (setpgrp() == -1) { -+ if (setpgrp(0, 0) == -1) { - return errno; - } - } Property changes on: head/devel/folly/files/patch-folly_Subprocess.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/folly/files/patch-folly_Subprocess.h =================================================================== --- head/devel/folly/files/patch-folly_Subprocess.h (revision 504358) +++ head/devel/folly/files/patch-folly_Subprocess.h (nonexistent) @@ -1,11 +0,0 @@ ---- folly/Subprocess.h.orig 2019-06-16 07:46:12 UTC -+++ folly/Subprocess.h -@@ -95,7 +95,7 @@ - #include - #include - --#if __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - #include - #else - #include Property changes on: head/devel/folly/files/patch-folly_Subprocess.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property