* [PR PATCH] EternalTerminal: Remove manual compile flag
@ 2019-12-28 1:21 voidlinux-github
2019-12-28 12:17 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-28 13:28 ` [PR PATCH] [Merged]: " voidlinux-github
0 siblings, 2 replies; 3+ messages in thread
From: voidlinux-github @ 2019-12-28 1:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 635 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages EternalTerminal
https://github.com/void-linux/void-packages/pull/17831
EternalTerminal: Remove manual compile flag
Re-edited CMakeLists.txt and sources to compile
with or without libexecinfo if system supports it
instead of using case to add or not add.
This is how I have the PR setup for both the ET upstream and
their vendor-ed dependency (easylogging)
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-EternalTerminal-17831.patch --]
[-- Type: text/x-diff, Size: 3734 bytes --]
From c9f353bbfc28d50a8ecc759853fbc381ef531e60 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Fri, 27 Dec 2019 19:11:01 -0600
Subject: [PATCH] EternalTerminal: Remove manual compile flag
Re-edited CMakeLists.txt and sources to compile
with or without libexecinfo if system supports it
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
.../EternalTerminal/patches/execinfo.patch | 40 +++++++++----------
srcpkgs/EternalTerminal/template | 2 +-
2 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/EternalTerminal/patches/execinfo.patch b/srcpkgs/EternalTerminal/patches/execinfo.patch
index 376ae6ed9ab..5e50259cb25 100644
--- a/srcpkgs/EternalTerminal/patches/execinfo.patch
+++ b/srcpkgs/EternalTerminal/patches/execinfo.patch
@@ -1,22 +1,22 @@
diff --git CMakeLists.txt CMakeLists.txt
-index b277dff..9ee989c 100644
+index b277dff..ad24b56 100644
--- CMakeLists.txt
+++ CMakeLists.txt
-@@ -12,6 +12,12 @@ endif()
+@@ -125,6 +125,12 @@ include_directories(
+ ${UTEMPTER_INCLUDE_DIR}
+ )
- option(CODE_COVERAGE "Enable code coverage" OFF)
- option(DISABLE_CRASH_LOG "Disable installing easylogging crash handler" OFF)
-+option(ENABLE_EXECINFO "Enable execinfo support" OFF)
-+
-+if(ENABLE_EXECINFO)
-+ SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -lexecinfo")
-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_EXECINFO")
++include(CheckIncludeFileCXX)
++check_include_file("execinfo.h" HAVE_EXECINFO_H)
++if (HAVE_EXECINFO_H)
++ add_definitions(-DHAVE_EXECINFO_H)
+endif()
-
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DET_VERSION='\"${PROJECT_VERSION}\"'")
- # For easylogging, disable default log file, enable crash log, ensure thread safe, and catch c++ exceptions
++
+ add_library(
+ et-lib
+ STATIC
diff --git external_imported/easyloggingpp/src/easylogging++.cc external_imported/easyloggingpp/src/easylogging++.cc
-index d763ee7..1237d9c 100644
+index d763ee7..02e8b75 100644
--- external_imported/easyloggingpp/src/easylogging++.cc
+++ external_imported/easyloggingpp/src/easylogging++.cc
@@ -2786,7 +2786,7 @@ std::ostream& operator<<(std::ostream& os, const StackTrace& st) {
@@ -24,24 +24,20 @@ index d763ee7..1237d9c 100644
void StackTrace::generateNew(void) {
-#if ELPP_STACKTRACE
-+#ifdef ENABLE_EXECINFO
++#ifdef HAVE_EXECINFO_H
m_stack.clear();
void* stack[kMaxStack];
unsigned int size = backtrace(stack, kMaxStack);
diff --git external_imported/easyloggingpp/src/easylogging++.h external_imported/easyloggingpp/src/easylogging++.h
-index 688d537..b4d754e 100644
+index 688d537..0b16966 100644
--- external_imported/easyloggingpp/src/easylogging++.h
+++ external_imported/easyloggingpp/src/easylogging++.h
-@@ -360,10 +360,10 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
+@@ -360,7 +360,7 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
# include <codecvt>
# endif // ELPP_OS_WINDOWS
#endif // defined(ELPP_UNICODE)
-#if ELPP_STACKTRACE
-+#ifdef ENABLE_EXECINFO
++#ifdef HAVE_EXECINFO_H
# include <cxxabi.h>
# include <execinfo.h>
--#endif // ELPP_STACKTRACE
-+#endif // ENABLE_EXECINFO
- #if ELPP_OS_ANDROID
- # include <sys/system_properties.h>
- #endif // ELPP_OS_ANDROID
+ #endif // ELPP_STACKTRACE
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index d5c6ef58283..544d7caf552 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
# Template file for 'EternalTerminal'
pkgname=EternalTerminal
version=6.0.5
-revision=1
+revision=2
wrksrc="${pkgname}-et-v${version}"
build_style=cmake
hostmakedepends="protobuf"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] EternalTerminal: Remove manual compile flag
2019-12-28 1:21 [PR PATCH] EternalTerminal: Remove manual compile flag voidlinux-github
@ 2019-12-28 12:17 ` voidlinux-github
2019-12-28 13:28 ` [PR PATCH] [Merged]: " voidlinux-github
1 sibling, 0 replies; 3+ messages in thread
From: voidlinux-github @ 2019-12-28 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 640 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages EternalTerminal
https://github.com/void-linux/void-packages/pull/17831
EternalTerminal: Remove manual compile flag
Re-edited CMakeLists.txt and sources to compile
with or without libexecinfo if system supports it
instead of using case to add or not add.
This is how I have the PR setup for both the ET upstream and
their vendor-ed dependency (easylogging)
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-EternalTerminal-17831.patch --]
[-- Type: text/x-diff, Size: 3927 bytes --]
From 40bc7286eab73f28113bd422dd2c1c929f34eda9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Fri, 27 Dec 2019 19:11:01 -0600
Subject: [PATCH] EternalTerminal: Remove manual compile flag
Re-edited CMakeLists.txt and sources to compile
with or without libexecinfo if system supports it
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
.../EternalTerminal/patches/execinfo.patch | 40 +++++++++----------
srcpkgs/EternalTerminal/template | 6 +--
2 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/EternalTerminal/patches/execinfo.patch b/srcpkgs/EternalTerminal/patches/execinfo.patch
index 376ae6ed9ab..5e50259cb25 100644
--- a/srcpkgs/EternalTerminal/patches/execinfo.patch
+++ b/srcpkgs/EternalTerminal/patches/execinfo.patch
@@ -1,22 +1,22 @@
diff --git CMakeLists.txt CMakeLists.txt
-index b277dff..9ee989c 100644
+index b277dff..ad24b56 100644
--- CMakeLists.txt
+++ CMakeLists.txt
-@@ -12,6 +12,12 @@ endif()
+@@ -125,6 +125,12 @@ include_directories(
+ ${UTEMPTER_INCLUDE_DIR}
+ )
- option(CODE_COVERAGE "Enable code coverage" OFF)
- option(DISABLE_CRASH_LOG "Disable installing easylogging crash handler" OFF)
-+option(ENABLE_EXECINFO "Enable execinfo support" OFF)
-+
-+if(ENABLE_EXECINFO)
-+ SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -lexecinfo")
-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_EXECINFO")
++include(CheckIncludeFileCXX)
++check_include_file("execinfo.h" HAVE_EXECINFO_H)
++if (HAVE_EXECINFO_H)
++ add_definitions(-DHAVE_EXECINFO_H)
+endif()
-
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DET_VERSION='\"${PROJECT_VERSION}\"'")
- # For easylogging, disable default log file, enable crash log, ensure thread safe, and catch c++ exceptions
++
+ add_library(
+ et-lib
+ STATIC
diff --git external_imported/easyloggingpp/src/easylogging++.cc external_imported/easyloggingpp/src/easylogging++.cc
-index d763ee7..1237d9c 100644
+index d763ee7..02e8b75 100644
--- external_imported/easyloggingpp/src/easylogging++.cc
+++ external_imported/easyloggingpp/src/easylogging++.cc
@@ -2786,7 +2786,7 @@ std::ostream& operator<<(std::ostream& os, const StackTrace& st) {
@@ -24,24 +24,20 @@ index d763ee7..1237d9c 100644
void StackTrace::generateNew(void) {
-#if ELPP_STACKTRACE
-+#ifdef ENABLE_EXECINFO
++#ifdef HAVE_EXECINFO_H
m_stack.clear();
void* stack[kMaxStack];
unsigned int size = backtrace(stack, kMaxStack);
diff --git external_imported/easyloggingpp/src/easylogging++.h external_imported/easyloggingpp/src/easylogging++.h
-index 688d537..b4d754e 100644
+index 688d537..0b16966 100644
--- external_imported/easyloggingpp/src/easylogging++.h
+++ external_imported/easyloggingpp/src/easylogging++.h
-@@ -360,10 +360,10 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
+@@ -360,7 +360,7 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
# include <codecvt>
# endif // ELPP_OS_WINDOWS
#endif // defined(ELPP_UNICODE)
-#if ELPP_STACKTRACE
-+#ifdef ENABLE_EXECINFO
++#ifdef HAVE_EXECINFO_H
# include <cxxabi.h>
# include <execinfo.h>
--#endif // ELPP_STACKTRACE
-+#endif // ENABLE_EXECINFO
- #if ELPP_OS_ANDROID
- # include <sys/system_properties.h>
- #endif // ELPP_OS_ANDROID
+ #endif // ELPP_STACKTRACE
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index d5c6ef58283..e234e5ee896 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
# Template file for 'EternalTerminal'
pkgname=EternalTerminal
version=6.0.5
-revision=1
+revision=2
wrksrc="${pkgname}-et-v${version}"
build_style=cmake
hostmakedepends="protobuf"
@@ -16,10 +16,6 @@ system_accounts="_eternal"
LDFLAGS="-lgflags"
-case "$XBPS_TARGET_LIBC" in
- glibc) configure_args="-DENABLE_EXECINFO=ON";;
-esac
-
post_install() {
vsv etserver
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: EternalTerminal: Remove manual compile flag
2019-12-28 1:21 [PR PATCH] EternalTerminal: Remove manual compile flag voidlinux-github
2019-12-28 12:17 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-12-28 13:28 ` voidlinux-github
1 sibling, 0 replies; 3+ messages in thread
From: voidlinux-github @ 2019-12-28 13:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There's a merged pull request on the void-packages repository
EternalTerminal: Remove manual compile flag
https://github.com/void-linux/void-packages/pull/17831
Description:
Re-edited CMakeLists.txt and sources to compile
with or without libexecinfo if system supports it
instead of using case to add or not add.
This is how I have the PR setup for both the ET upstream and
their vendor-ed dependency (easylogging)
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-28 13:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-28 1:21 [PR PATCH] EternalTerminal: Remove manual compile flag voidlinux-github
2019-12-28 12:17 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-28 13:28 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).