From a8805b3280ff5587e3898d5588902e190d1ff67a Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 10 Feb 2022 12:18:24 +0100 Subject: [PATCH 1/2] dumpCallback needs types only available when crash reporting is on (and breakpad included). While at it remove dummy code in dumpCallback --- indra/newview/llappviewerlinux.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 650f710f08..5bdfa0725e 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -137,19 +137,13 @@ LLAppViewerLinux::~LLAppViewerLinux() { } +#if LL_SEND_CRASH_REPORTS static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* context, bool succeeded) { - std::map< std::string, std::string> parameters, files; - parameters["prod"] = "MyApp"; - parameters["ver"] = "1.0"; - parameters["email"] = "fred@bugsplat.com"; - parameters["comments"] = "BugSplat rocks!"; - files["upload_file_minidump"] = descriptor.path(); - printf("Dump path: %s\n", descriptor.path() ); return succeeded; } - +#endif bool LLAppViewerLinux::init() { From dd9ad9ee8f9e7b495f2e3c9226ba6b1104111464 Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 10 Feb 2022 12:20:14 +0100 Subject: [PATCH 2/2] Make sure we only get python2 and not python3, as we're still stuck with that. 2 years after it went EOL ... --- indra/cmake/Python.cmake | 3 ++- indra/cmake/run_build_test.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake index 6ac5cf3fc2..e9e83089c0 100644 --- a/indra/cmake/Python.cmake +++ b/indra/cmake/Python.cmake @@ -57,7 +57,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(PYTHONINTERP_FOUND ON) endif (PYTHON_EXECUTABLE) else (WINDOWS) - include(FindPythonInterp) + include(FindPython2) + set( PYTHON_EXECUTABLE ${Python2_EXECUTABLE}) endif (WINDOWS) if (NOT PYTHON_EXECUTABLE) diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index dd4b9d2c1b..bf8184f3d2 100755 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 """\ @file run_build_test.py @author Nat Goodspeed