Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[glog] Update to 0.5.0 #20351

Closed
wants to merge 9 commits into from
Closed

[glog] Update to 0.5.0 #20351

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d73d567
Update glog to 0.5.0
chausner Sep 26, 2021
aa8189a
Update CI baseline
chausner Sep 26, 2021
9645fbc
Fix patch
chausner Sep 26, 2021
34f7cde
Update git-tree hash
chausner Sep 26, 2021
9b873e8
Switch from version-string to version
chausner Sep 27, 2021
79ddedd
Update git-tree hash
chausner Sep 27, 2021
95a2a48
Add patch working around a bug in glog
chausner Sep 27, 2021
50aec74
Update git-tree hash
chausner Sep 27, 2021
6563255
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ports/glog/glog_disable_debug_postfix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
29 changes: 29 additions & 0 deletions ports/glog/glog_fix_os_defines.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 4 additions & 2 deletions ports/glog/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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()

Expand Down
3 changes: 1 addition & 2 deletions ports/glog/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2429,8 +2429,8 @@
"port-version": 4
},
"glog": {
"baseline": "0.4.0",
"port-version": 4
"baseline": "0.5.0",
"port-version": 0
},
"gloo": {
"baseline": "20201203",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/glog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "efa371c3421ffdefd59df747651a54b7f7a8ad83",
"version": "0.5.0",
"port-version": 0
},
{
"git-tree": "27503732c21f2d6652d12d62b1e9c180c1d33c47",
"version-string": "0.4.0",
Expand Down