[Libreoffice-commits] core.git: 2 commits - external/breakpad

[Markus Mohrhard]

 external/breakpad/ExternalProject_breakpad.mk |    2 +-
 external/breakpad/breakpad-stackwalk.patch.1  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3f22898c157995eecf5dbd610591d378820cf992
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 27 04:42:22 2016 +0200

    I screwed up with the breakpad minidump_stackwalk patch
    
    This does not affect normal LibreOffice and is only important for the
    server side.
    
    Change-Id: I270262ed6e1b22c3ef41099fda19fa386f386203

diff --git a/external/breakpad/breakpad-stackwalk.patch.1 b/external/breakpad/breakpad-stackwalk.patch.1
index 9a3ce95..8df1fa3 100644
--- a/external/breakpad/breakpad-stackwalk.patch.1
+++ b/external/breakpad/breakpad-stackwalk.patch.1
@@ -24,9 +24,9 @@ diff -ur breakpad.org/src/processor/stackwalk_common.cc breakpad/src/processor/s
             kOutputSeparator, base_address + module->size() - 1,
             kOutputSeparator,
 -           main_module != NULL && base_address == main_address ? 1 : 0);
-+           main_module != NULL && base_address == main_address ? 1 : 0),
++           main_module != NULL && base_address == main_address ? 1 : 0,
 +           kOutputSeparator,
-+           StripSeparator(PathnameStripper::File(module->code_identifier())).c_str();
++           StripSeparator(PathnameStripper::File(module->code_identifier())).c_str());
    }
  }
  
commit e54b208df3ee037a21c4d36678c5561c0f4718ae
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jun 27 04:41:57 2016 +0200

    always compile breakpad with O2
    
    Change-Id: I4cda93fee47244cf3eb7b13bb6cb2a3eab007cf0

diff --git a/external/breakpad/ExternalProject_breakpad.mk b/external/breakpad/ExternalProject_breakpad.mk
index 70df68e..10fa6ce 100644
--- a/external/breakpad/ExternalProject_breakpad.mk
+++ b/external/breakpad/ExternalProject_breakpad.mk
@@ -20,7 +20,7 @@ else # !ifeq($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,breakpad,build) :
 	$(call gb_ExternalProject_run,build,\
-		./configure \
+		CXX_FLAGS="-O2" ./configure \
 		&& $(MAKE) \
 	)