-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add backtrace detection patch to glog
- Loading branch information
1 parent
fcee04f
commit d5d384a
Showing
3 changed files
with
23 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
recipes/odrcore/all/patches/1.0.0-0002-fix-glog-stacktrace-misdetection.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- CMakeLists.txt | ||
+++ CMakeLists.txt | ||
@@ -59,6 +59,13 @@ | ||
FetchContent_GetProperties(glog) | ||
if(NOT glog_POPULATED) | ||
FetchContent_Populate(glog) | ||
+ file(READ ${glog_SOURCE_DIR}/CMakeLists.txt GLOG_CMAKELISTS) | ||
+ string(REPLACE | ||
+ "set (HAVE_STACKTRACE 1)" | ||
+ "if (NOT DEFINED ANDROID)\nset (HAVE_STACKTRACE 1)\nendif(NOT DEFINED ANDROID)" | ||
+ GLOG_CMAKELISTS | ||
+ "${GLOG_CMAKELISTS}") | ||
+ file(WRITE ${glog_SOURCE_DIR}/CMakeLists.txt "${GLOG_CMAKELISTS}") | ||
set(BUILD_TESTING OFF CACHE BOOL "" FORCE) | ||
add_subdirectory(${glog_SOURCE_DIR} ${glog_BINARY_DIR} EXCLUDE_FROM_ALL) | ||
endif() |
6 changes: 3 additions & 3 deletions
6
....0.0-0002-fix-cryptopp-cpu-features.patch → ....0.0-0003-fix-cryptopp-cpu-features.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
--- CMakeLists.txt | ||
+++ CMakeLists.txt 2024-07-22 14:56:00 +0300 | ||
@@ -82,6 +82,10 @@ | ||
+++ CMakeLists.txt | ||
@@ -89,6 +89,10 @@ | ||
FetchContent_GetProperties(cryptopp) | ||
if(NOT cryptopp_POPULATED) | ||
FetchContent_Populate(cryptopp) | ||
+ if (DEFINED CMAKE_ANDROID_NDK) | ||
+ file(COPY ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c DESTINATION ${cryptopp_SOURCE_DIR}) | ||
+ file(COPY ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.h DESTINATION ${cryptopp_SOURCE_DIR}) | ||
+ endif (DEFINED CMAKE_ANDROID_NDK) | ||
+ endif(DEFINED CMAKE_ANDROID_NDK) | ||
set(BUILD_TESTING OFF CACHE BOOL "" FORCE) | ||
add_subdirectory(${cryptopp_SOURCE_DIR} ${cryptopp_BINARY_DIR} EXCLUDE_FROM_ALL) | ||
endif() |