[wangle]:fix dependency (#30792)

* [wangle]:fix dependency * fix deps * fix Required find_dependenct * fix deps * fix deps * fix deps * fix deps * fix depends * fix folly vcpkg.json boost deps * fix deps
microsoft · Apr 26, 2023 · 40ab347 · 40ab347
1 parent 061428f
commit 40ab347
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 37 deletions.
diff --git a/ports/folly/fix-deps.patch b/ports/folly/fix-deps.patch
@@ -57,7 +57,7 @@ index 4b78e9f..ac83c99 100644
      thread
    REQUIRED
  )
-+set (Boost_LIBRARIES Boost::context Boost::filesystem Boost::program_options Boost::regex  Boost::system Boost::thread
++set (Boost_LIBRARIES Boost::boost Boost::context Boost::filesystem Boost::program_options Boost::regex  Boost::system Boost::thread
 +  )
  list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
 -list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})

diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "folly",
   "version-string": "2022.10.31.00",
-  "port-version": 5,
+  "port-version": 6,
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "license": "Apache-2.0",

diff --git a/ports/wangle/fix_dependency.patch b/ports/wangle/fix_dependency.patch
@@ -1,17 +1,26 @@
 diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
-index 8df7c76..f605f25 100644
+index 977bbe4..155f9cc 100644
 --- a/wangle/CMakeLists.txt
 +++ b/wangle/CMakeLists.txt
-@@ -62,7 +62,7 @@ find_package(folly CONFIG REQUIRED)
+@@ -64,18 +64,23 @@ set(CMAKE_INSTALL_DIR lib/cmake/wangle CACHE STRING
+ find_package(folly CONFIG REQUIRED)
+
  find_package(fizz CONFIG REQUIRED)
- find_package(fmt CONFIG REQUIRED)
+-find_package(fmt CONFIG REQUIRED)
  find_package(OpenSSL REQUIRED)
 -find_package(Glog REQUIRED)
+-find_package(gflags CONFIG QUIET)
 +find_package(glog CONFIG REQUIRED)
- find_package(gflags CONFIG QUIET)
++find_package(gflags CONFIG REQUIRED)
++find_package(Boost REQUIRED
++  COMPONENTS
++	filesystem
++	thread
++)
++
  if (gflags_FOUND)
    message(STATUS "Found gflags from package config")
-@@ -70,8 +70,8 @@ if (gflags_FOUND)
+   message(STATUS "gflags_CONFIG=${gflags_CONFIG}")
  else()
    find_package(Gflags REQUIRED)
  endif()
@@ -22,35 +31,49 @@ index 8df7c76..f605f25 100644
  find_package(Threads REQUIRED)
  if (UNIX AND NOT APPLE)
    find_package(Librt)
-@@ -153,24 +153,23 @@ target_include_directories(
-   PUBLIC
-     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>
-     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
-+  PRIVATE
-     ${FIZZ_INCLUDE_DIR}
-     ${FOLLY_INCLUDE_DIR}
-     ${Boost_INCLUDE_DIR}
--    ${OPENSSL_INCLUDE_DIR}
--    ${GLOG_INCLUDE_DIRS}
-     ${GFLAGS_INCLUDE_DIRS}
--    ${LIBEVENT_INCLUDE_DIR}
--    ${DOUBLE_CONVERSION_INCLUDE_DIRS}
+@@ -166,6 +171,14 @@ target_include_directories(
+     ${LIBEVENT_INCLUDE_DIR}
+     ${DOUBLE_CONVERSION_INCLUDE_DIRS}
  )
++set(Boost_LIBRARIES             Boost::boost Boost::filesystem  Boost::thread )
++set(FOLLY_LIBRARIES             Folly::folly)
++set(FIZZ_LIBRARIES              fizz::fizz)
++set(GLOG_LIBRARIES              glog::glog)
++set(GFLAGS_LIBRARIES            gflags::gflags)
++set(LIBEVENT_LIB                libevent::core libevent::extra)
++set(DOUBLE_CONVERSION_LIBRARIES double-conversion::double-conversion)
++
  target_link_libraries(wangle PUBLIC
    ${FOLLY_LIBRARIES}
    ${FIZZ_LIBRARIES}
-   ${Boost_LIBRARIES}
--  ${OPENSSL_LIBRARIES}
--  ${GLOG_LIBRARIES}
-+  OpenSSL::SSL
-+  OpenSSL::Crypto
-+  glog::glog
-   ${GFLAGS_LIBRARIES}
--  ${LIBEVENT_LIB}
--  ${DOUBLE_CONVERSION_LIBRARIES}
-+  libevent::core
-+  libevent::extra
-+  double-conversion::double-conversion
-   ${CMAKE_DL_LIBS}
-   ${LIBRT_LIBRARIES}
-   Threads::Threads)
+diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in
+index e0fd0dc..5f6cf14 100644
+--- a/wangle/cmake/wangle-config.cmake.in
++++ b/wangle/cmake/wangle-config.cmake.in
+@@ -15,13 +15,19 @@ set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+ set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle")
+
+ include(CMakeFindDependencyMacro)
+-find_dependency(folly REQUIRED)
+-find_dependency(fizz REQUIRED)
+-find_dependency(glog REQUIRED)
+-find_dependency(Threads REQUIRED)
+-find_dependency(Libevent REQUIRED)
+-find_dependency(OpenSSL REQUIRED)
+-find_dependency(double-conversion REQUIRED)
++find_dependency(folly CONFIG)
++find_dependency(fizz CONFIG)
++find_dependency(gflags CONFIG)
++find_dependency(glog CONFIG)
++find_dependency(Threads)
++find_dependency(Libevent CONFIG)
++find_dependency(OpenSSL)
++find_dependency(double-conversion CONFIG)
++find_dependency(Boost
++  COMPONENTS
++    filesystem
++    thread
++)
+
+ if (NOT TARGET wangle::wangle)
+   include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake")
diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
@@ -11,6 +11,17 @@ vcpkg_from_github(
         fix_dependency.patch
 )
 
+file(REMOVE
+  "${SOURCE_PATH}/wangle/cmake/FindDoubleConversion.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake"
+)
+
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/wangle"
     OPTIONS

diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "wangle",
   "version-string": "2022.03.21.00",
+  "port-version": 1,
   "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.",
   "homepage": "https://github.com/facebook/wangle",
   "license": "Apache-2.0",
@@ -13,6 +14,7 @@
     "double-conversion",
     "fizz",
     "folly",
+    "gflags",
     "glog",
     "libevent",
     "openssl",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2542,7 +2542,7 @@
     },
     "folly": {
       "baseline": "2022.10.31.00",
-      "port-version": 5
+      "port-version": 6
     },
     "font-chef": {
       "baseline": "1.1.0",
@@ -8382,7 +8382,7 @@
     },
     "wangle": {
       "baseline": "2022.03.21.00",
-      "port-version": 0
+      "port-version": 1
     },
     "wasmedge": {
       "baseline": "0.12.0-alpha.1",

diff --git a/versions/f-/folly.json b/versions/f-/folly.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "204d88dbc53dc5ff37c58459c1af0c6f19f446db",
+      "version-string": "2022.10.31.00",
+      "port-version": 6
+    },
     {
       "git-tree": "2be8536b3faaf9f907284548e4db1f49b77054c1",
       "version-string": "2022.10.31.00",

diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e79739dcf42e3dd4d0e32c595b27ece48c762bdd",
+      "version-string": "2022.03.21.00",
+      "port-version": 1
+    },
     {
       "git-tree": "6f0fec69eddf934964ee77b9923f68da2c3c7724",
       "version-string": "2022.03.21.00",