Build all of folly for HHVM OSS rather than patching out bits and pieces

CMake/HPHPFindLibs.cmake

@@ -285,6 +285,9 @@ if (PAM_INCLUDE_PATH)
   include_directories(${PAM_INCLUDE_PATH})
 endif()
 
+find_package(LibLZMA MODULE REQUIRED)
+find_package(Snappy CONFIG REQUIRED)
+
 include_directories(${HPHP_HOME}/hphp)
 
 macro(hphp_link target)
@@ -429,6 +432,8 @@ macro(hphp_link target)
   target_link_libraries(${target} ${VISIBILITY} afdt)
   target_link_libraries(${target} ${VISIBILITY} mbfl)
 
+  target_link_libraries(${target} ${VISIBILITY} ${LIBLZMA_LIBRARIES} Snappy::snappy)
+
   if (LINUX)
     target_link_libraries(${target} ${VISIBILITY} ${LIBUNWIND_LIBRARIES})
   endif()

third-party/folly/CMakeLists.txt

@@ -71,13 +71,6 @@ ExternalProject_add(
     -DZSTD_LIBRARY_RELEASE=${ZSTD_LIBRARY}
   BUILD_COMMAND
     $(MAKE) folly
-  INSTALL_COMMAND
-# Prefered, but needs CMake 3.15 or above. Revist when Ubuntu 18.04 support is removed
-#    ${CMAKE_COMMAND} --install . --config ${CMAKE_BUILD_TYPE} --component dev &&
-#    ${CMAKE_COMMAND} --install . --config ${CMAKE_BUILD_TYPE} --component lib
-# Legacy way:
-    ${CMAKE_COMMAND} -DCOMPONENT=dev -P cmake_install.cmake --config ${CMAKE_BUILD_TYPE} &&
-    ${CMAKE_COMMAND} -DCOMPONENT=lib -P cmake_install.cmake --config ${CMAKE_BUILD_TYPE}
 )
 ExternalProject_Get_Property(bundled_folly INSTALL_DIR)
 set(

third-party/folly/patches/series

@@ -1,7 +1,4 @@
 disable-liblzma.patch
 folly-cmake-fixup.patch
-folly-install-component.patch
 disable-libsnappy.patch
-without-unwind-symbolizer.patch
-do-not-export-unbuilt-targets.patch
 bad_implicit_cast.patch