Skip to content

Commit

Permalink
Merge pull request #8583 from ammubhave/bump_glog
Browse files Browse the repository at this point in the history
glog: Bump version to 0.4.0
  • Loading branch information
neheb authored Apr 3, 2019
2 parents 07eb900 + 2b78423 commit 4502666
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
6 changes: 3 additions & 3 deletions libs/libglog/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=glog
PKG_VERSION:=0.3.5
PKG_RELEASE:=3
PKG_VERSION:=0.4.0
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/google/glog/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=7580e408a2c0b5a89ca214739978ce6ff480b5e7d8d7698a2aa92fadc484d1e0
PKG_HASH:=f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c

PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILE:=COPYING
Expand Down
13 changes: 13 additions & 0 deletions libs/libglog/patches/100-fix-musl-compilation.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: glog-0.4.0/src/symbolize_unittest.cc
===================================================================
--- glog-0.4.0.orig/src/symbolize_unittest.cc
+++ glog-0.4.0/src/symbolize_unittest.cc
@@ -401,7 +401,7 @@ int main(int argc, char **argv) {
FLAGS_logtostderr = true;
InitGoogleLogging(argv[0]);
InitGoogleTest(&argc, argv);
-#if defined(HAVE_SYMBOLIZE)
+#if defined(HAVE_SYMBOLIZE) && defined(HAVE_STACKTRACE)
# if defined(__ELF__)
// We don't want to get affected by the callback interface, that may be
// used to install some callback function at InitGoogle() time.

0 comments on commit 4502666

Please sign in to comment.