mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 19:19:01 +08:00
[glog] update to 0.7.0 (#37071)
- [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md) - [X] SHA512s are updated for each updated download - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version~ - [ ] ~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~ - [ ] ~Any patches that are no longer applied are deleted from the port's directory.~ - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file.
This commit is contained in:
parent
935a3f1561
commit
683c1dfd2d
47
ports/braft/fix-glog.patch
Normal file
47
ports/braft/fix-glog.patch
Normal file
@ -0,0 +1,47 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c88b0a2..bd3b74f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -55,12 +55,8 @@ if ((NOT GFLAGS_INCLUDE_PATH) OR (NOT GFLAGS_LIB))
|
||||
endif()
|
||||
|
||||
if(BRPC_WITH_GLOG)
|
||||
- find_path(GLOG_INCLUDE_PATH NAMES glog/logging.h)
|
||||
- find_library(GLOG_LIB NAMES glog)
|
||||
- if((NOT GLOG_INCLUDE_PATH) OR (NOT GLOG_LIB))
|
||||
- message(FATAL_ERROR "Fail to find glog")
|
||||
- endif()
|
||||
- include_directories(${GLOG_INCLUDE_PATH})
|
||||
+ find_package(glog CONFIG REQUIRED)
|
||||
+ set(GLOG_LIB glog::glog)
|
||||
endif()
|
||||
|
||||
if(LEVELDB_WITH_SNAPPY)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index ff435a2..4e7591b 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -10,6 +10,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
include_directories(${CMAKE_SOURCE_DIR}/src)
|
||||
|
||||
add_library(OBJ_LIB OBJECT ${SOURCES})
|
||||
+target_include_directories(OBJ_LIB PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
+target_link_libraries(OBJ_LIB PUBLIC ${DYNAMIC_LIB})
|
||||
+
|
||||
|
||||
set_property(TARGET ${OBJ_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
@@ -18,13 +21,6 @@ else()
|
||||
add_library(braft-static STATIC $<TARGET_OBJECTS:OBJ_LIB>)
|
||||
endif()
|
||||
|
||||
-if (BUILD_SHARED_LIBS)
|
||||
-target_include_directories(braft-shared PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
-target_link_libraries(braft-shared PUBLIC ${DYNAMIC_LIB})
|
||||
-else()
|
||||
-target_include_directories(braft-static PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
-target_link_libraries(braft-static PUBLIC ${DYNAMIC_LIB})
|
||||
-endif()
|
||||
|
||||
if (NOT BUILD_SHARED_LIBS)
|
||||
SET_TARGET_PROPERTIES(braft-static PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUTPUT 1)
|
@ -16,6 +16,7 @@ vcpkg_from_github(
|
||||
fix-dependency.patch
|
||||
export-target.patch
|
||||
"${GCC_11_PATCH}"
|
||||
fix-glog.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "braft",
|
||||
"version-date": "2021-26-04",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Consensus algorithm library",
|
||||
"homepage": "https://github.com/baidu/braft",
|
||||
"license": "Apache-2.0",
|
||||
|
90
ports/brpc/fix-glog.patch
Normal file
90
ports/brpc/fix-glog.patch
Normal file
@ -0,0 +1,90 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f4add26..b87e845 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -80,9 +80,10 @@ include(GNUInstallDirs)
|
||||
configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_SOURCE_DIR}/src/butil/config.h @ONLY)
|
||||
|
||||
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
|
||||
-
|
||||
-find_package(GFLAGS REQUIRED)
|
||||
-
|
||||
+set(GFLAGS_USE_TARGET_NAMESPACE ON)
|
||||
+find_package(gflags CONFIG REQUIRED)
|
||||
+set(GFLAGS_LIBRARY gflags::gflags)
|
||||
+if(0)
|
||||
execute_process(
|
||||
COMMAND bash -c "grep \"namespace [_A-Za-z0-9]\\+ {\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $2}' | tr -d '\n'"
|
||||
OUTPUT_VARIABLE GFLAGS_NS
|
||||
@@ -93,6 +94,8 @@ if(${GFLAGS_NS} STREQUAL "GFLAGS_NAMESPACE")
|
||||
OUTPUT_VARIABLE GFLAGS_NS
|
||||
)
|
||||
endif()
|
||||
+endif()
|
||||
+set(GFLAGS_NS "google")
|
||||
|
||||
include_directories(
|
||||
${PROJECT_SOURCE_DIR}/src
|
||||
@@ -122,21 +125,21 @@ set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEBUG_SYMBOL} ${THRIFT_CPP_FLAG}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-unused-parameter -fno-omit-frame-pointer")
|
||||
|
||||
-macro(use_cxx11)
|
||||
+macro(use_cxx14)
|
||||
if(CMAKE_VERSION VERSION_LESS "3.1.3")
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
|
||||
endif()
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
|
||||
endif()
|
||||
else()
|
||||
- set(CMAKE_CXX_STANDARD 11)
|
||||
+ set(CMAKE_CXX_STANDARD 14)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
endif()
|
||||
-endmacro(use_cxx11)
|
||||
+endmacro(use_cxx14)
|
||||
|
||||
-use_cxx11()
|
||||
+use_cxx14()
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
#required by butil/crc32.cc to boost performance for 10x
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 95037a0..24007d7 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -31,6 +31,10 @@ add_dependencies(SOURCES_LIB PROTO_LIB)
|
||||
set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||||
set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||||
|
||||
+if(BRPC_WITH_GLOG)
|
||||
+ target_link_libraries(BUTIL_LIB PUBLIC ${GLOG_LIB})
|
||||
+ target_link_libraries(SOURCES_LIB PUBLIC ${GLOG_LIB})
|
||||
+endif()
|
||||
if(NOT BUILD_SHARED_LIBS)
|
||||
add_library(brpc-static STATIC $<TARGET_OBJECTS:BUTIL_LIB>
|
||||
$<TARGET_OBJECTS:SOURCES_LIB>
|
||||
@@ -41,9 +45,6 @@ if(WITH_THRIFT)
|
||||
endif()
|
||||
|
||||
target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB})
|
||||
-if(BRPC_WITH_GLOG)
|
||||
- target_link_libraries(brpc-static ${GLOG_LIB})
|
||||
-endif()
|
||||
target_include_directories(brpc-static PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
|
||||
|
||||
@@ -64,9 +65,6 @@ if(BUILD_SHARED_LIBS)
|
||||
$<TARGET_OBJECTS:SOURCES_LIB>
|
||||
$<TARGET_OBJECTS:PROTO_LIB>)
|
||||
target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
- if(BRPC_WITH_GLOG)
|
||||
- target_link_libraries(brpc-shared ${GLOG_LIB})
|
||||
- endif()
|
||||
if(WITH_THRIFT)
|
||||
target_link_libraries(brpc-shared ${THRIFT_LIB})
|
||||
endif()
|
@ -7,6 +7,7 @@ vcpkg_from_github(
|
||||
PATCHES
|
||||
fix-build.patch
|
||||
fix-boost-ptr.patch
|
||||
fix-glog.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "brpc",
|
||||
"version": "1.6.1",
|
||||
"port-version": 1,
|
||||
"description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
|
||||
"homepage": "https://github.com/apache/incubator-brpc",
|
||||
"license": "Apache-2.0",
|
||||
|
13
ports/cachelib/fix-glog.patch
Normal file
13
ports/cachelib/fix-glog.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/cachelib/CMakeLists.txt b/cachelib/CMakeLists.txt
|
||||
index 6be8199..2ebff62 100644
|
||||
--- a/cachelib/CMakeLists.txt
|
||||
+++ b/cachelib/CMakeLists.txt
|
||||
@@ -96,7 +96,7 @@ find_package(Threads REQUIRED)
|
||||
find_package(Boost REQUIRED COMPONENTS
|
||||
system filesystem regex context program_options thread)
|
||||
find_package(Gflags REQUIRED)
|
||||
-find_package(Glog REQUIRED)
|
||||
+find_package(glog CONFIG REQUIRED)
|
||||
find_package(GTest CONFIG REQUIRED)
|
||||
find_package(folly CONFIG REQUIRED)
|
||||
find_package(fizz CONFIG REQUIRED)
|
@ -7,6 +7,7 @@ vcpkg_from_github(
|
||||
PATCHES
|
||||
fix-build.patch
|
||||
fmt-10.patch
|
||||
fix-glog.patch
|
||||
)
|
||||
|
||||
FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h
|
||||
@ -18,6 +19,7 @@ IF (NOT NUMA_INCLUDE_DIR)
|
||||
MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)")
|
||||
ENDIF ()
|
||||
|
||||
file(REMOVE "${SOURCE_PATH}/cmake/FindGlog.cmake")
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}/cachelib"
|
||||
OPTIONS
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "cachelib",
|
||||
"version-string": "2023.05.08.00",
|
||||
"port-version": 1,
|
||||
"description": "facebook cachelib",
|
||||
"homepage": "https://github.com/facebook/CacheLib",
|
||||
"license": "Apache-2.0",
|
||||
|
@ -13,6 +13,7 @@ vcpkg_from_github(
|
||||
compile-features.patch
|
||||
Add-static-shared-handling.patch
|
||||
Export-unofficial-target.patch
|
||||
use-cxx14-standard.patch
|
||||
)
|
||||
|
||||
file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/rapidjson" "${SOURCE_PATH}/3rdparty/concurrentqueue")
|
||||
|
30
ports/evpp/use-cxx14-standard.patch
Normal file
30
ports/evpp/use-cxx14-standard.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 772da36..7ff62b8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -24,7 +24,7 @@ if (UNIX)
|
||||
-fms-extensions
|
||||
-Wfloat-equal
|
||||
-Wextra
|
||||
- -std=c++11
|
||||
+ -std=c++14
|
||||
)
|
||||
include_directories (${PROJECT_SOURCE_DIR}
|
||||
${PROJECT_SOURCE_DIR}/3rdparty)
|
||||
diff --git a/evpp/CMakeLists.txt b/evpp/CMakeLists.txt
|
||||
index 1c17f04..9f07f97 100644
|
||||
--- a/evpp/CMakeLists.txt
|
||||
+++ b/evpp/CMakeLists.txt
|
||||
@@ -15,12 +15,10 @@ include_directories(${PROJECT_SOURCE_DIR})
|
||||
|
||||
add_library(evpp_static STATIC ${evpp_SRCS})
|
||||
target_link_libraries(evpp_static ${DEPENDENT_LIBRARIES})
|
||||
-target_compile_features(evpp_static PRIVATE cxx_std_11)
|
||||
target_include_directories(evpp_static INTERFACE $<INSTALL_INTERFACE:include>)
|
||||
|
||||
add_library(evpp_lite_static STATIC ${evpp_lite_SRCS})
|
||||
target_link_libraries(evpp_lite_static ${DEPENDENT_LIBRARIES})
|
||||
-target_compile_features(evpp_lite_static PRIVATE cxx_std_11)
|
||||
target_include_directories(evpp_lite_static INTERFACE $<INSTALL_INTERFACE:include>)
|
||||
|
||||
if (UNIX)
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "evpp",
|
||||
"version": "0.7.0",
|
||||
"port-version": 7,
|
||||
"port-version": 8,
|
||||
"description": "A modern C++ network library based on libevent for developing high performance network services in TCP/UDP/HTTP protocols.",
|
||||
"homepage": "https://github.com/Qihoo360/evpp",
|
||||
"license": "BSD-3-Clause",
|
||||
|
13
ports/folly/fix-unistd-include.patch
Normal file
13
ports/folly/fix-unistd-include.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/folly/experimental/symbolizer/Elf.cpp b/folly/experimental/symbolizer/Elf.cpp
|
||||
index 6a7f74f..6546fe0 100644
|
||||
--- a/folly/experimental/symbolizer/Elf.cpp
|
||||
+++ b/folly/experimental/symbolizer/Elf.cpp
|
||||
@@ -49,6 +49,8 @@
|
||||
#define FOLLY_ELF_NATIVE_CLASS __WORDSIZE
|
||||
#endif // __ELF_NATIVE_CLASS
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
namespace folly {
|
||||
namespace symbolizer {
|
||||
|
@ -19,6 +19,7 @@ vcpkg_from_github(
|
||||
fix-deps.patch
|
||||
openssl.patch # from https://github.com/facebook/folly/pull/2016
|
||||
disable-uninitialized-resize-on-new-stl.patch
|
||||
fix-unistd-include.patch
|
||||
)
|
||||
|
||||
file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "folly",
|
||||
"version-string": "2024.01.01.00",
|
||||
"port-version": 1,
|
||||
"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",
|
||||
|
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d145517..e8e1c90 100644
|
||||
index 985f5f5..bf6600e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -669,6 +669,10 @@ if (CYGWIN OR WIN32)
|
||||
@@ -476,6 +476,10 @@ if (CYGWIN OR WIN32)
|
||||
target_compile_definitions (glog PUBLIC GLOG_NO_ABBREVIATED_SEVERITIES)
|
||||
endif (CYGWIN OR WIN32)
|
||||
|
||||
@ -10,6 +10,6 @@ index d145517..e8e1c90 100644
|
||||
+ target_compile_options(glog INTERFACE "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/Zc:__cplusplus>")
|
||||
+endif()
|
||||
+
|
||||
if (WITH_CUSTOM_PREFIX)
|
||||
target_compile_definitions (glog PUBLIC GLOG_CUSTOM_PREFIX_SUPPORT)
|
||||
endif (WITH_CUSTOM_PREFIX)
|
||||
set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}")
|
||||
|
||||
target_include_directories (glog BEFORE PUBLIC
|
||||
|
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d314abe..d145517 100644
|
||||
index fe1d85f..985f5f5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -450,6 +450,9 @@ endif (HAVE_CXX11_ATOMIC)
|
||||
@@ -243,6 +243,9 @@ endif (HAVE_EXECINFO_BACKTRACE AND HAVE_EXECINFO_BACKTRACE_SYMBOLS)
|
||||
|
||||
if (WITH_SYMBOLIZE)
|
||||
if (WIN32 OR CYGWIN)
|
||||
@ -12,7 +12,7 @@ index d314abe..d145517 100644
|
||||
cmake_push_check_state (RESET)
|
||||
set (CMAKE_REQUIRED_LIBRARIES DbgHelp)
|
||||
|
||||
@@ -480,6 +483,7 @@ if (WITH_SYMBOLIZE)
|
||||
@@ -273,6 +276,7 @@ if (WITH_SYMBOLIZE)
|
||||
]=] HAVE_SYMBOLIZE)
|
||||
|
||||
cmake_pop_check_state ()
|
||||
|
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 846b444..20441d1 100644
|
||||
index b787631..41bf110 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1027,7 +1027,7 @@ write_basic_package_version_file (
|
||||
@@ -1000,7 +1000,7 @@ write_basic_package_version_file (
|
||||
|
||||
export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake)
|
||||
export (PACKAGE glog)
|
||||
@ -11,16 +11,16 @@ index 846b444..20441d1 100644
|
||||
get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
|
||||
|
||||
# Directory containing the find modules relative to the config install
|
||||
@@ -1063,6 +1063,7 @@ file (INSTALL
|
||||
@@ -1036,6 +1036,7 @@ file (INSTALL
|
||||
"
|
||||
COMPONENT Development
|
||||
)
|
||||
+endif()
|
||||
|
||||
install (FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake
|
||||
${glog_BINARY_DIR}/glog-config.cmake
|
||||
diff --git a/glog-config.cmake.in b/glog-config.cmake.in
|
||||
index 5c5c9c0..31fac52 100644
|
||||
index 7d98525..93bc7d9 100644
|
||||
--- a/glog-config.cmake.in
|
||||
+++ b/glog-config.cmake.in
|
||||
@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@)
|
||||
@ -29,5 +29,5 @@ index 5c5c9c0..31fac52 100644
|
||||
include (CMakeFindDependencyMacro)
|
||||
-include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake)
|
||||
|
||||
@gflags_DEPENDENCY@
|
||||
@Unwind_DEPENDENCY@
|
||||
find_dependency (Threads)
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 20441d1..d314abe 100644
|
||||
index 41bf110..fe1d85f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -65,7 +65,7 @@ set (CMAKE_CXX_VISIBILITY_PRESET hidden)
|
||||
@@ -61,7 +61,7 @@ set (CMAKE_CXX_VISIBILITY_PRESET hidden)
|
||||
set (CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
set (CMAKE_VISIBILITY_INLINES_HIDDEN ON)
|
||||
|
||||
-set (CMAKE_DEBUG_POSTFIX d)
|
||||
+#set (CMAKE_DEBUG_POSTFIX d)
|
||||
set (CMAKE_THREAD_PREFER_PTHREAD 1)
|
||||
|
||||
find_package (GTest NO_MODULE)
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO google/glog
|
||||
REF v0.6.0
|
||||
SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226
|
||||
REF "v${VERSION}"
|
||||
SHA512 7222bb432c2b645238018233b2d18f254156617ef2921d18d17364866a7a3a05533fff1d63fd5033e1e5d3746a11806d007e7a36efaff667a0d3006dee45c278
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix_glog_CMAKE_MODULE_PATH.patch
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "glog",
|
||||
"version": "0.6.0",
|
||||
"port-version": 3,
|
||||
"version": "0.7.0",
|
||||
"description": "C++ implementation of the Google logging module",
|
||||
"homepage": "https://github.com/google/glog",
|
||||
"license": "BSD-3-Clause",
|
||||
|
13
ports/libtorch/fix-calculate-minloglevel.patch
Normal file
13
ports/libtorch/fix-calculate-minloglevel.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/c10/util/Logging.cpp b/c10/util/Logging.cpp
|
||||
index 306dac5..dca802c 100644
|
||||
--- a/c10/util/Logging.cpp
|
||||
+++ b/c10/util/Logging.cpp
|
||||
@@ -272,7 +272,7 @@ void UpdateLoggingLevelsFromFlags() {
|
||||
|
||||
void ShowLogInfoToStderr() {
|
||||
FLAGS_logtostderr = 1;
|
||||
- FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::GLOG_INFO);
|
||||
+ FLAGS_minloglevel = std::min(FLAGS_minloglevel, static_cast<decltype(FLAGS_minloglevel)>(google::GLOG_INFO));
|
||||
}
|
||||
} // namespace c10
|
||||
|
@ -19,6 +19,7 @@ vcpkg_from_github(
|
||||
fix-sleef.patch
|
||||
fix-glog.patch
|
||||
fix-msvc-ICE.patch
|
||||
fix-calculate-minloglevel.patch
|
||||
)
|
||||
file(REMOVE_RECURSE "${SOURCE_PATH}/caffe2/core/macros.h") # We must use generated header files
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "libtorch",
|
||||
"version": "2.1.2",
|
||||
"port-version": 1,
|
||||
"description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration",
|
||||
"homepage": "https://pytorch.org/",
|
||||
"license": null,
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0c776a091a987943aadb4879fdb7434929d4dd3d",
|
||||
"version-date": "2021-26-04",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "774dbc3ef386eed16fd345f23109f94a899f39e8",
|
||||
"version-date": "2021-26-04",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "5460a635b3cfa64a9857a378a798ded7f60abc74",
|
||||
"version": "1.6.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "e8671f4e4a1523a2f58b71e7413ad0b8dab7c1c4",
|
||||
"version": "1.6.1",
|
||||
|
@ -1334,7 +1334,7 @@
|
||||
},
|
||||
"braft": {
|
||||
"baseline": "2021-26-04",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"breakpad": {
|
||||
"baseline": "2023-01-27",
|
||||
@ -1350,7 +1350,7 @@
|
||||
},
|
||||
"brpc": {
|
||||
"baseline": "1.6.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"brunocodutra-metal": {
|
||||
"baseline": "2.1.4",
|
||||
@ -1426,7 +1426,7 @@
|
||||
},
|
||||
"cachelib": {
|
||||
"baseline": "2023.05.08.00",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"caf": {
|
||||
"baseline": "0.19.3",
|
||||
@ -2526,7 +2526,7 @@
|
||||
},
|
||||
"evpp": {
|
||||
"baseline": "0.7.0",
|
||||
"port-version": 7
|
||||
"port-version": 8
|
||||
},
|
||||
"exiv2": {
|
||||
"baseline": "0.28.1",
|
||||
@ -2758,7 +2758,7 @@
|
||||
},
|
||||
"folly": {
|
||||
"baseline": "2024.01.01.00",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"font-chef": {
|
||||
"baseline": "1.1.0",
|
||||
@ -3061,8 +3061,8 @@
|
||||
"port-version": 6
|
||||
},
|
||||
"glog": {
|
||||
"baseline": "0.6.0",
|
||||
"port-version": 3
|
||||
"baseline": "0.7.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"gloo": {
|
||||
"baseline": "20201203",
|
||||
@ -5002,7 +5002,7 @@
|
||||
},
|
||||
"libtorch": {
|
||||
"baseline": "2.1.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"libtorrent": {
|
||||
"baseline": "2.0.10",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2776e1f2137ef0df48a05a4e52d905077b60eb82",
|
||||
"version-string": "2023.05.08.00",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "0a22cdb1063bfa706ab5a7085ba8724785eabc53",
|
||||
"version-string": "2023.05.08.00",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "1eda7115a751bcbf31efdbbbf0bdefb16e4b67e2",
|
||||
"version": "0.7.0",
|
||||
"port-version": 8
|
||||
},
|
||||
{
|
||||
"git-tree": "419e928841663bb077cd215aa89bd022d850640c",
|
||||
"version": "0.7.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d9bc612fada471c0339350d455290614c57027ac",
|
||||
"version-string": "2024.01.01.00",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "14d0ea48901f854308ce005f8de818b0a0bb06b2",
|
||||
"version-string": "2024.01.01.00",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "156f77e07786151f8e405514ce79c0865ad13788",
|
||||
"version": "0.7.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "3e4dcaa54d409ed758073ef4964cf41d57996e90",
|
||||
"version": "0.6.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "19855d043442630ea2d8060e49c66cc50c0c9d7a",
|
||||
"version": "2.1.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "418db4a2514c9530b67097fca0ce7cafde5a2a15",
|
||||
"version": "2.1.2",
|
||||
|
Loading…
Reference in New Issue
Block a user