From 3106071c283cdfb75816c38392c88f75f00f522b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 4 Apr 2020 14:40:41 -0700 Subject: [PATCH] libglog: remove Was used by libfolly. Signed-off-by: Rosen Penev --- libs/libglog/Makefile | 48 ------------------- .../patches/100-fix-musl-compilation.patch | 13 ----- libs/libglog/patches/110-nanosleep.patch | 24 ---------- 3 files changed, 85 deletions(-) delete mode 100644 libs/libglog/Makefile delete mode 100644 libs/libglog/patches/100-fix-musl-compilation.patch delete mode 100644 libs/libglog/patches/110-nanosleep.patch diff --git a/libs/libglog/Makefile b/libs/libglog/Makefile deleted file mode 100644 index f70b7a1cf..000000000 --- a/libs/libglog/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=glog -PKG_VERSION:=0.4.0 -PKG_RELEASE:=4 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/google/glog/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c - -PKG_MAINTAINER:=Amir Sabbaghi -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=COPYING - -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/glog - SECTION:=libs - CATEGORY:=Libraries - TITLE:=C++ implementation of the Google logging module - DEPENDS:=+libstdcpp +libpthread +gflags - URL:=https://github.com/google/glog -endef - -define Package/glog/description - This repository contains a C++ implementation of the Google logging - module. Documentation for the implementation is in doc/. -endef - -CMAKE_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_TESTING=OFF \ - -DUNWIND_LIBRARY=OFF - -TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_CFLAGS += -Wl,--gc-sections - -define Package/glog/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libglog.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,glog)) diff --git a/libs/libglog/patches/100-fix-musl-compilation.patch b/libs/libglog/patches/100-fix-musl-compilation.patch deleted file mode 100644 index dab64bec8..000000000 --- a/libs/libglog/patches/100-fix-musl-compilation.patch +++ /dev/null @@ -1,13 +0,0 @@ -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. diff --git a/libs/libglog/patches/110-nanosleep.patch b/libs/libglog/patches/110-nanosleep.patch deleted file mode 100644 index 8d1a2ffa0..000000000 --- a/libs/libglog/patches/110-nanosleep.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d7b02b6929baf5b21ee6e15a700b4fc82d962e9c Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Thu, 25 Jul 2019 19:14:42 -0700 -Subject: [PATCH] googletest: Switch to nanosleep - -usleep is deprecated and optionally not available with uClibc-ng. ---- - src/googletest.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/googletest.h b/src/googletest.h -index 49ddbc0a..39fb29fb 100644 ---- a/src/googletest.h -+++ b/src/googletest.h -@@ -574,7 +574,8 @@ class Thread { - - static inline void SleepForMilliseconds(int t) { - #ifndef OS_WINDOWS -- usleep(t * 1000); -+ const struct timespec req = {0, t * 1000 * 1000}; -+ nanosleep(&req, NULL); - #else - Sleep(t); - #endif