diff --git a/ports/glog/glog_disable_debug_postfix.patch b/ports/glog/glog_disable_debug_postfix.patch index 7b882e1faf6917..ee7221195e6f31 100644 --- a/ports/glog/glog_disable_debug_postfix.patch +++ b/ports/glog/glog_disable_debug_postfix.patch @@ -2,12 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 808330e..de0e477 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -44,7 +44,7 @@ include (CTest) - include (DetermineGflagsNamespace) +@@ -65,7 +65,7 @@ include (GenerateExportHeader) + include (GetCacheVariables) include (GNUInstallDirs) -set (CMAKE_DEBUG_POSTFIX d) +#set (CMAKE_DEBUG_POSTFIX d) set (CMAKE_THREAD_PREFER_PTHREAD 1) - if (WITH_GFLAGS) + find_package (GTest) diff --git a/ports/glog/glog_fix_os_defines.patch b/ports/glog/glog_fix_os_defines.patch new file mode 100644 index 00000000000000..be937fc86f392c --- /dev/null +++ b/ports/glog/glog_fix_os_defines.patch @@ -0,0 +1,29 @@ +diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in +@@ -61,6 +61,25 @@ + #if @ac_cv_have_glog_export@ + #include "glog/export.h" + #endif ++ ++// definitions from utilities.h which are needed by glog/logging.h ++#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) && !defined(OS_WINDOWS) ++# define OS_WINDOWS ++#elif (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(OS_CYGWIN) ++# define OS_CYGWIN ++#elif (defined(linux) || defined(__linux) || defined(__linux__)) && !defined(OS_LINUX) ++# define OS_LINUX ++#elif (defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)) && !defined(OS_MACOSX) ++# define OS_MACOSX ++#elif defined(__FreeBSD__) && !defined(OS_FREEBSD) ++# define OS_FREEBSD ++#elif defined(__NetBSD__) && !defined(OS_NETBSD) ++# define OS_NETBSD ++#elif defined(__OpenBSD__) && !defined(OS_OPENBSD) ++# define OS_OPENBSD ++#else ++// TODO(hamaji): Add other platforms. ++#endif + + // Annoying stuff for windows -- makes sure clients can import these functions + #ifndef GOOGLE_GLOG_DLL_DECL diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 8487cc19219055..ff77d8bd8261b8 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/glog - REF v0.4.0 - SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176 + REF v0.5.0 + SHA512 445E4338F3D81CD0B065F2DA9C6CE343C243263CA144CEA424EF97531A4E9E09C06FFD6942AC01C5213A8003C75CFBBEDE3C4028D12F0134F23FF29314769C1A HEAD_REF master PATCHES glog_disable_debug_postfix.patch + glog_fix_os_defines.patch ) vcpkg_configure_cmake( @@ -20,6 +21,7 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glog) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_copy_pdbs() diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index 6a0da077d82841..5bffeac557b0a4 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glog", - "version-string": "0.4.0", - "port-version": 4, + "version": "0.5.0", "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 857ce7a8e40caa..5ec70c22cd3555 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2441,8 +2441,8 @@ "port-version": 4 }, "glog": { - "baseline": "0.4.0", - "port-version": 4 + "baseline": "0.5.0", + "port-version": 0 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 8a105b070e2cda..7560d339a947e3 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efa371c3421ffdefd59df747651a54b7f7a8ad83", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "27503732c21f2d6652d12d62b1e9c180c1d33c47", "version-string": "0.4.0",