breakpad: Add libtool patch.

chaffra · Jan 14, 2015 · 8d9c86d · 8d9c86d
1 parent 80a87a3
commit 8d9c86d
Show file tree

Hide file tree

Showing 2 changed files with 226 additions and 0 deletions.
diff --git a/mingw-w64-breakpad-svn/0027-google-breakpad-0.1.svn.1413-libtool.patch b/mingw-w64-breakpad-svn/0027-google-breakpad-0.1.svn.1413-libtool.patch
@@ -0,0 +1,224 @@
+diff -rupN google-breakpad-0.1.svn.969/configure.ac google-breakpad-0.1.svn.969_mod/configure.ac
+--- google-breakpad-0.1.svn.969/configure.ac	2012-06-12 01:52:23.000000000 +0200
++++ google-breakpad-0.1.svn.969_mod/configure.ac	2012-06-12 13:20:41.264351886 +0200
+@@ -44,7 +44,7 @@ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_CPP
+ AC_PROG_CXX
+-AC_PROG_RANLIB
++LT_INIT([disable-shared])
+ AC_CHECK_TOOL(WINDRES, [windres])
+ AM_CONDITIONAL(GCC, test "$GCC" = yes)   # let the Makefile know if we're gcc
+
+diff -rupN google-breakpad-0.1.svn.969/Makefile.am google-breakpad-0.1.svn.969_mod/Makefile.am
+--- google-breakpad-0.1.svn.969/Makefile.am	2012-06-12 01:52:23.000000000 +0200
++++ google-breakpad-0.1.svn.969_mod/Makefile.am	2012-06-12 13:14:22.051174459 +0200
+@@ -110,22 +110,22 @@ dist_doc_DATA = \
+ pkgconfig_DATA =
+
+ ## Libraries
+-noinst_LIBRARIES =
+-lib_LIBRARIES =
++noinst_LTLIBRARIES =
++lib_LTLIBRARIES =
+ bin_PROGRAMS =
+ check_PROGRAMS =
+
+ if !DISABLE_PROCESSOR
+-lib_LIBRARIES += src/libbreakpad.a
++lib_LTLIBRARIES += src/libbreakpad.la
+ pkgconfig_DATA += breakpad.pc
+-noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a
++noinst_LTLIBRARIES += src/third_party/libdisasm/libdisasm.la
+ endif
+
+ if LINUX_HOST
+-lib_LIBRARIES += src/client/linux/libbreakpad_client.a
++lib_LTLIBRARIES += src/client/linux/libbreakpad_client.la
+ pkgconfig_DATA += breakpad-client.pc
+
+-src_client_linux_libbreakpad_client_a_SOURCES = \
++src_client_linux_libbreakpad_client_la_SOURCES = \
+ 	src/client/linux/crash_generation/crash_generation_client.cc \
+ 	src/client/linux/crash_generation/crash_generation_server.cc \
+ 	src/client/linux/dump_writer_common/seccomp_unwinder.cc \
+@@ -160,13 +160,13 @@ src_client_linux_libbreakpad_client_a_SO
+ 	src/common/linux/memory_mapped_file.cc \
+ 	src/common/linux/safe_readlink.cc
+ if ANDROID_HOST
+-src_client_linux_libbreakpad_client_a_SOURCES += \
++src_client_linux_libbreakpad_client_la_SOURCES += \
+ 	src/common/android/breakpad_getcontext.S
+ endif
+ endif LINUX_HOST
+
+ if !DISABLE_PROCESSOR
+-src_libbreakpad_a_SOURCES = \
++src_libbreakpad_la_SOURCES = \
+ 	src/google_breakpad/common/breakpad_types.h \
+ 	src/google_breakpad/common/minidump_format.h \
+ 	src/google_breakpad/common/minidump_size.h \
+@@ -272,9 +272,9 @@ src_libbreakpad_a_SOURCES = \
+ 	src/processor/tokenize.cc \
+ 	src/processor/tokenize.h
+
+-src_libbreakpad_a_LIBADD = src/third_party/libdisasm/libdisasm.a
++src_libbreakpad_la_LIBADD = src/third_party/libdisasm/libdisasm.la
+
+-src_third_party_libdisasm_libdisasm_a_SOURCES = \
++src_third_party_libdisasm_libdisasm_la_SOURCES = \
+ 	src/third_party/libdisasm/ia32_implicit.c \
+ 	src/third_party/libdisasm/ia32_implicit.h \
+ 	src/third_party/libdisasm/ia32_insn.c \
+@@ -448,7 +448,8 @@ src_client_linux_linux_client_unittest_C
+ 	-I$(top_srcdir)/src/testing/include \
+ 	-I$(top_srcdir)/src/testing/gtest/include \
+ 	-I$(top_srcdir)/src/testing/gtest \
+-	-I$(top_srcdir)/src/testing
++	-I$(top_srcdir)/src/testing \
++	$(AM_CPPFLAGS)
+ src_client_linux_linux_client_unittest_shlib_LDFLAGS = \
+ 	-shared \
+ 	-Wl,-h,linux_client_unittest_shlib
+@@ -500,8 +500,8 @@ src_client_linux_linux_client_unittest_L
+
+ src_client_linux_linux_client_unittest_DEPENDENCIES = \
+ 	src/client/linux/linux_dumper_unittest_helper \
+-	src/client/linux/libbreakpad_client.a \
+-	src/libbreakpad.a
++	src/client/linux/libbreakpad_client.la \
++	src/libbreakpad.la
+
+ if !DISABLE_TOOLS
+ src_tools_linux_core2md_core2md_SOURCES = \
+@@ -508,8 +508,11 @@ src_tools_linux_core2md_core2md_SOURCES
+ 	src/common/linux/elf_core_dump.cc
+
+ src_tools_linux_core2md_core2md_LDADD = \
+-	src/client/linux/libbreakpad_client.a
++	src/client/linux/libbreakpad_client.la \
++	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
++src_tools_linux_dump_syms_dump_syms_CPPFLAGS = \
++	$(AM_CPPFLAGS)
+ src_tools_linux_dump_syms_dump_syms_SOURCES = \
+ 	src/common/dwarf_cfi_to_module.cc \
+ 	src/common/dwarf_cu_to_module.cc \
+@@ -531,6 +531,8 @@ src_tools_linux_dump_syms_dump_syms_SOUR
+ 	src/common/linux/safe_readlink.cc \
+ 	src/tools/linux/dump_syms/dump_syms.cc
+
++src_tools_linux_md2core_minidump_2_core_CPPFLAGS = \
++	$(AM_CPPFLAGS)
+ src_tools_linux_md2core_minidump_2_core_SOURCES = \
+ 	src/common/linux/memory_mapped_file.cc \
+ 	src/tools/linux/md2core/minidump-2-core.cc
+@@ -427,7 +433,8 @@ src_common_dumper_unittest_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/testing/gtest/include \
+ 	-I$(top_srcdir)/src/testing/gtest \
+ 	-I$(top_srcdir)/src/testing \
+-	$(PTHREAD_CFLAGS)
++	$(PTHREAD_CFLAGS) \
++	$(AM_CPPFLAGS)
+ src_common_dumper_unittest_LDADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ endif
+
+@@ -723,7 +723,7 @@ src_processor_exploitability_unittest_LD
+ 	src/processor/stackwalker_sparc.o \
+ 	src/processor/stackwalker_x86.o \
+ 	src/processor/tokenize.o \
+-	src/third_party/libdisasm/libdisasm.a \
++	src/third_party/libdisasm/libdisasm.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+ src_processor_disassembler_x86_unittest_SOURCES = \
+@@ -739,7 +739,7 @@ src_processor_disassembler_x86_unittest_
+ 	-I$(top_srcdir)/src/testing
+ src_processor_disassembler_x86_unittest_LDADD = \
+ 	src/processor/disassembler_x86.o \
+-	src/third_party/libdisasm/libdisasm.a \
++	src/third_party/libdisasm/libdisasm.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+ src_processor_fast_source_line_resolver_unittest_SOURCES = \
+@@ -857,7 +857,7 @@ src_processor_minidump_processor_unittes
+ 	src/processor/stackwalker_sparc.o \
+ 	src/processor/stackwalker_x86.o \
+ 	src/processor/tokenize.o \
+-	src/third_party/libdisasm/libdisasm.a \
++	src/third_party/libdisasm/libdisasm.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+
+ src_processor_minidump_unittest_SOURCES = \
+@@ -998,7 +998,7 @@ src_processor_stackwalker_amd64_unittest
+ 	src/testing/gtest/src/gtest_main.cc \
+ 	src/testing/src/gmock-all.cc
+ src_processor_stackwalker_amd64_unittest_LDADD = \
+-	src/libbreakpad.a \
++	src/libbreakpad.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ src_processor_stackwalker_amd64_unittest_CPPFLAGS = \
+ 	-I$(top_srcdir)/src \
+@@ -1014,7 +1014,7 @@ src_processor_stackwalker_arm_unittest_S
+ 	src/testing/gtest/src/gtest_main.cc \
+ 	src/testing/src/gmock-all.cc
+ src_processor_stackwalker_arm_unittest_LDADD = \
+-	src/libbreakpad.a \
++	src/libbreakpad.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ src_processor_stackwalker_arm_unittest_CPPFLAGS = \
+ 	-I$(top_srcdir)/src \
+@@ -1085,7 +1085,7 @@
+ 	src/testing/gtest/src/gtest_main.cc \
+ 	src/testing/src/gmock-all.cc
+ src_processor_stackwalker_arm64_unittest_LDADD = \
+-	src/libbreakpad.a \
++	src/libbreakpad.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ src_processor_stackwalker_arm64_unittest_CPPFLAGS = \
+ 	-I$(top_srcdir)/src \
+@@ -1101,7 +1101,7 @@
+ 	src/testing/gtest/src/gtest_main.cc \
+ 	src/testing/src/gmock-all.cc
+ src_processor_stackwalker_address_list_unittest_LDADD = \
+-	src/libbreakpad.a \
++	src/libbreakpad.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ src_processor_stackwalker_address_list_unittest_CPPFLAGS = \
+ 	-I$(top_srcdir)/src \
+@@ -1117,7 +1117,7 @@
+ 	src/testing/gtest/src/gtest_main.cc \
+ 	src/testing/src/gmock-all.cc
+ src_processor_stackwalker_mips_unittest_LDADD = \
+-	src/libbreakpad.a \
++	src/libbreakpad.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ src_processor_stackwalker_mips_unittest_CPPFLAGS = \
+ 	-I$(top_srcdir)/src \
+@@ -1133,7 +1133,7 @@ src_processor_stackwalker_x86_unittest_S
+ 	src/testing/gtest/src/gtest_main.cc \
+ 	src/testing/src/gmock-all.cc
+ src_processor_stackwalker_x86_unittest_LDADD = \
+-	src/libbreakpad.a \
++	src/libbreakpad.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ src_processor_stackwalker_x86_unittest_CPPFLAGS = \
+ 	-I$(top_srcdir)/src \
+@@ -1166,7 +1166,7 @@ src_processor_minidump_stackwalk_LDADD =
+ 	src/processor/stackwalker_sparc.o \
+ 	src/processor/stackwalker_x86.o \
+ 	src/processor/tokenize.o \
+-	src/third_party/libdisasm/libdisasm.a \
++	src/third_party/libdisasm/libdisasm.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
+
+ src_processor_minidump_stackwalk_SOURCES = \
+@@ -1202,7 +1202,7 @@
+ 	src/processor/stackwalker_sparc.o \
+ 	src/processor/stackwalker_x86.o \
+ 	src/processor/tokenize.o \
+-	src/third_party/libdisasm/libdisasm.a \
++	src/third_party/libdisasm/libdisasm.la \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SOCKET_LIBS) @LIBOBJS@
+
+ endif !DISABLE_PROCESSOR
diff --git a/mingw-w64-breakpad-svn/PKGBUILD b/mingw-w64-breakpad-svn/PKGBUILD
@@ -37,6 +37,7 @@ source=(${_name}.svn::"svn+http://google-breakpad.googlecode.com/svn/trunk"
         0023-Fix-a-missing-r-in-crash_generation_app.patch
         0024-Disable-timeout-waiting-for-crash-reporting-server.patch
         0026-Fixes-for-sign-compare-warnings-due-to-signedness-of.patch
+        0027-google-breakpad-0.1.svn.1413-libtool.patch
         gyp-regenerate-no-circular-check.patch
         Makefile
         README.sample)
@@ -180,6 +181,7 @@ md5sums=('SKIP'
          '6d60d14c043a16deed5152455b6ce5c1'
          'e49ab09a126650a2890d50eb9dadeee4'
          '4b5a73a41be9f4909feb952c3ec5086f'
+         'ce284a4f34503fe41ee303e6cb0a6348'
          '58e93eee7934e96ede810bbfd42374ca'
          '7fa446492cfb06497a57e68a416b1087'
          '577c35acf8ddcf504dab502c30fceea4')