libfolly: Update to 2019.10.07.00

Added patch to remove boost-thread.

Removed uClibc-ng patch. libfolly no longer builds there.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from b9000043bf)
This commit is contained in:
Rosen Penev
2019-10-07 10:32:50 -07:00
parent 3b1cf245fe
commit fbc1c29a7d
4 changed files with 23 additions and 38 deletions
@@ -1,8 +1,6 @@
Index: folly-2019.05.06.00/CMakeLists.txt
===================================================================
--- folly-2019.05.06.00.orig/CMakeLists.txt
+++ folly-2019.05.06.00/CMakeLists.txt
@@ -109,17 +109,19 @@ configure_file(
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,17 +112,19 @@ configure_file(
auto_sources(files "*.cpp" "RECURSE" "${FOLLY_DIR}")
auto_sources(hfiles "*.h" "RECURSE" "${FOLLY_DIR}")
@@ -29,7 +27,7 @@ Index: folly-2019.05.06.00/CMakeLists.txt
"Benchmark.cpp$"
"Test.cpp$"
)
@@ -172,7 +174,7 @@ list(APPEND hfiles
@@ -175,7 +177,7 @@ list(APPEND hfiles
if (NOT FOLLY_USE_SYMBOLIZER)
REMOVE_MATCHES_FROM_LISTS(files hfiles
MATCHES
@@ -0,0 +1,12 @@
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
index 0c212057..a4c06695 100644
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -12,7 +12,6 @@ find_package(Boost 1.51.0 MODULE
program_options
regex
system
- thread
REQUIRED
)
list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
@@ -1,23 +0,0 @@
--- a/folly/CachelinePadded.h
+++ b/folly/CachelinePadded.h
@@ -35,10 +35,6 @@ namespace folly {
*/
template <typename T>
class CachelinePadded {
- static_assert(
- alignof(T) <= max_align_v,
- "CachelinePadded does not support over-aligned types.");
-
public:
template <typename... Args>
explicit CachelinePadded(Args&&... args)
--- a/folly/external/farmhash/farmhash.cpp
+++ b/folly/external/farmhash/farmhash.cpp
@@ -181,6 +181,7 @@
#undef bswap_32
#undef bswap_64
+#undef _BYTESWAP_H
#include <byteswap.h>
#endif