Attached diff updates devel/glog from 0.4.0 to 0.5.0. The changelog can be viewed here:
https://github.com/google/glog/releases/tag/v0.5.0 Changes included upstreaming of the PowerPC-specific patch in our tree. It also appears the hack for sparc64, arm64 and mips may no longer be required. There's been quite a bit of upstream churn, as such we need to do a version bump also. Tested on amd64 and it seems to be working as well as it did prior to the update. It looks like everything in the tree that actually uses glog vendors their own copy, so don't expect any repercussions on other ports. Thanks, Ash
Index: devel/glog/Makefile =================================================================== RCS file: /cvs/ports/devel/glog/Makefile,v retrieving revision 1.19 diff -u -p -u -p -r1.19 Makefile --- devel/glog/Makefile 5 Mar 2021 01:24:44 -0000 1.19 +++ devel/glog/Makefile 15 May 2021 21:19:25 -0000 @@ -4,10 +4,9 @@ COMMENT = C++ application-level logging GH_ACCOUNT = google GH_PROJECT = glog -GH_TAGNAME = v0.4.0 -REVISION = 1 +GH_TAGNAME = v0.5.0 -SHARED_LIBS += glog 2.0 # 0.2.1 +SHARED_LIBS += glog 3.0 # 0.5.0 CATEGORIES = devel Index: devel/glog/distinfo =================================================================== RCS file: /cvs/ports/devel/glog/distinfo,v retrieving revision 1.6 diff -u -p -u -p -r1.6 distinfo --- devel/glog/distinfo 26 Nov 2020 20:37:13 -0000 1.6 +++ devel/glog/distinfo 15 May 2021 21:19:25 -0000 @@ -1,2 +1,2 @@ -SHA256 (glog-0.4.0.tar.gz) = 8oNZrroS8w1z2eRxHvNW3IQohpaBEhYrxzACZFE5w5w= -SIZE (glog-0.4.0.tar.gz) = 200955 +SHA256 (glog-0.5.0.tar.gz) = 7t5x8oNxvzmqabRd4jsynTchQBbiBVJps7Xnz9QLWfU= +SIZE (glog-0.5.0.tar.gz) = 183346 Index: devel/glog/patches/patch-src_stacktrace_powerpc-inl_h =================================================================== RCS file: devel/glog/patches/patch-src_stacktrace_powerpc-inl_h diff -N devel/glog/patches/patch-src_stacktrace_powerpc-inl_h --- devel/glog/patches/patch-src_stacktrace_powerpc-inl_h 27 Apr 2020 15:45:46 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_stacktrace_powerpc-inl_h,v 1.1 2020/04/27 15:45:46 cwen Exp $ - -Fix the lack of _CALL_SYSV on powerpc with clang, from: -https://github.com/google/glog/pull/545 - -Index: src/stacktrace_powerpc-inl.h ---- src/stacktrace_powerpc-inl.h.orig -+++ src/stacktrace_powerpc-inl.h -@@ -114,7 +114,7 @@ int GetStackTrace(void** result, int max_depth, int sk - #elif defined(__APPLE__) || ((defined(__linux) || defined(__linux__)) && defined(__PPC64__)) - // This check is in case the compiler doesn't define _CALL_AIX/etc. - result[n++] = *(sp+2); --#elif defined(__linux) -+#elif defined(__linux) || defined(__OpenBSD__) - // This check is in case the compiler doesn't define _CALL_SYSV. - result[n++] = *(sp+1); - #else Index: devel/glog/patches/patch-src_symbolize_unittest_cc =================================================================== RCS file: devel/glog/patches/patch-src_symbolize_unittest_cc diff -N devel/glog/patches/patch-src_symbolize_unittest_cc --- devel/glog/patches/patch-src_symbolize_unittest_cc 5 Mar 2021 01:25:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_symbolize_unittest_cc,v 1.1 2021/03/05 01:25:08 kmos Exp $ - -This test causes problems on (at least) sparc64 and mips64. It appears they try -to call this even though those functions don't exist for those archs. - -Index: src/symbolize_unittest.cc ---- src/symbolize_unittest.cc.orig -+++ src/symbolize_unittest.cc -@@ -402,7 +402,7 @@ int main(int argc, char **argv) { - InitGoogleLogging(argv[0]); - InitGoogleTest(&argc, argv); - #if defined(HAVE_SYMBOLIZE) --# if defined(__ELF__) -+# if defined(__ELF__) && defined(TEST_X86_32_AND_64) - // We don't want to get affected by the callback interface, that may be - // used to install some callback function at InitGoogle() time. - InstallSymbolizeCallback(NULL); Index: devel/glog/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/glog/pkg/PLIST,v retrieving revision 1.5 diff -u -p -u -p -r1.5 PLIST --- devel/glog/pkg/PLIST 26 Nov 2020 20:37:13 -0000 1.5 +++ devel/glog/pkg/PLIST 15 May 2021 21:19:25 -0000 @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.5 2020/11/26 20:37:13 sthen Exp $ include/glog/ +include/glog/export.h include/glog/log_severity.h include/glog/logging.h include/glog/raw_logging.h @@ -8,6 +9,8 @@ include/glog/vlog_is_on.h lib/cmake/glog/ lib/cmake/glog/glog-config-version.cmake lib/cmake/glog/glog-config.cmake +lib/cmake/glog/glog-modules.cmake lib/cmake/glog/glog-targets${MODCMAKE_BUILD_SUFFIX} lib/cmake/glog/glog-targets.cmake @lib lib/libglog.so.${LIBglog_VERSION} +lib/pkgconfig/libglog.pc
