[skipci] Update glog stacktrace misdetection patch

opendocument-app · Jul 22, 2024 · 0d5c761 · 0d5c761
1 parent d5d384a
commit 0d5c761
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/recipes/odrcore/all/conandata.yml b/recipes/odrcore/all/conandata.yml
@@ -38,7 +38,7 @@ patches:
       patch_description: "Fix header install in CMakeLists.txt"
       patch_type: "conan"
     - patch_file: "patches/1.0.0-0002-fix-glog-stacktrace-misdetection.patch"
-      patch_description: "Glog checks if execinfo.h is available and if it is - expects backtrace to be there, but backtrace only available from Android API 33"
+      patch_description: "Glog checks if execinfo.h is available and if it is - expects backtrace to be there, but backtrace is only available from Android API 33"
       patch_type: "conan"
     - patch_file: "patches/1.0.0-0003-fix-cryptopp-cpu-features.patch"
       patch_description: "Cryptopp expects cpu-features.h and .c to be in the source dir, prepare them"

diff --git a/recipes/odrcore/all/patches/1.0.0-0002-fix-glog-stacktrace-misdetection.patch b/recipes/odrcore/all/patches/1.0.0-0002-fix-glog-stacktrace-misdetection.patch
@@ -6,8 +6,8 @@
      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)"
++            "check_include_file (execinfo.h HAVE_EXECINFO_H)"
++            "if(NOT ANDROID)\n check_include_file (execinfo.h HAVE_EXECINFO_H)\n endif()"
 +            GLOG_CMAKELISTS
 +            "${GLOG_CMAKELISTS}")
 +    file(WRITE ${glog_SOURCE_DIR}/CMakeLists.txt "${GLOG_CMAKELISTS}")