glog, bump version (#9339)

This commit is contained in:
Schrijvers Luc
2023-09-02 17:27:01 +00:00
committed by GitHub
parent 0be177f1c2
commit f11d07c6ba
3 changed files with 66 additions and 38 deletions

View File

@@ -1,22 +0,0 @@
From 1c1b8f8071ff6d877a2b34b6287c6c90c93b683b Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 23 Apr 2017 16:01:56 +0200
Subject: fix top-level entry share
diff --git a/Makefile.am b/Makefile.am
index 3756465..dd17806 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ gloginclude_HEADERS = src/glog/log_severity.h
nodist_gloginclude_HEADERS = src/glog/logging.h src/glog/raw_logging.h src/glog/vlog_is_on.h src/glog/stl_logging.h
noinst_HEADERS = src/glog/logging.h.in src/glog/raw_logging.h.in src/glog/vlog_is_on.h.in src/glog/stl_logging.h.in
-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+docdir = @docdir@/$(PACKAGE)-$(VERSION)
## This is for HTML and other documentation you want to install.
## Add your documentation files (in doc/) in addition to these
## top-level boilerplate files. Also add a TODO file if you have one.
--
2.7.0

View File

@@ -0,0 +1,45 @@
From d5f36e8fc4f110ecf1b43972b492dc614a56899f Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 2 Sep 2023 18:12:29 +0200
Subject: Add Haiku to supported platforms
diff --git a/src/glog/platform.h b/src/glog/platform.h
index e614411..a97b9f2 100644
--- a/src/glog/platform.h
+++ b/src/glog/platform.h
@@ -50,6 +50,8 @@
#define GLOG_OS_NETBSD
#elif defined(__OpenBSD__)
#define GLOG_OS_OPENBSD
+#elif defined(__HAIKU__)
+#define GLOG_OS_HAIKU
#else
// TODO(hamaji): Add other platforms.
#error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github.
--
2.37.3
From aa7460fd9969e09df9e98bdd71ed73da5a002359 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 2 Sep 2023 18:37:03 +0200
Subject: Don't set CMAKE_POSITION_INDEPENDENT_CODE to ON
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 846b444..08bb9c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ endif (NOT WITH_THREADS)
set (CMAKE_C_VISIBILITY_PRESET hidden)
set (CMAKE_CXX_VISIBILITY_PRESET hidden)
-set (CMAKE_POSITION_INDEPENDENT_CODE ON)
+set (CMAKE_POSITION_INDEPENDENT_CODE OFF)
set (CMAKE_VISIBILITY_INLINES_HIDDEN ON)
set (CMAKE_DEBUG_POSTFIX d)
--
2.37.3