From 2b7842348e3f5a75d35bae6e477d1201c3f688af Mon Sep 17 00:00:00 2001 From: Amol Bhave Date: Wed, 3 Apr 2019 11:24:04 -0700 Subject: [PATCH] glog: Bump version to 0.4.0 bump glog version from 0.3.5 to 0.4.0 Tested by building another package which depends on glog and verify that it builds successfully. Signed-off-by: Amol Bhave --- libs/libglog/Makefile | 6 +++--- libs/libglog/patches/100-fix-musl-compilation.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 libs/libglog/patches/100-fix-musl-compilation.patch diff --git a/libs/libglog/Makefile b/libs/libglog/Makefile index 98b1970f05..dcaab6afb6 100644 --- a/libs/libglog/Makefile +++ b/libs/libglog/Makefile @@ -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 diff --git a/libs/libglog/patches/100-fix-musl-compilation.patch b/libs/libglog/patches/100-fix-musl-compilation.patch new file mode 100644 index 0000000000..dab64bec85 --- /dev/null +++ b/libs/libglog/patches/100-fix-musl-compilation.patch @@ -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. -- 2.30.2