Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8583 from ammubhave/bump_glog

Browse source 
glog: Bump version to 0.4.0
This commit is contained in:
Rosen Penev 2019-04-03 13:08:36 -07:00 committed by GitHub
commit 4502666bae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/libglog/Makefile
View file

@ -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

13
libs/libglog/patches/100-fix-musl-compilation.patch Normal file
View file

@ -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.