Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build for 12.1 and above by building dump_syms dynamic
authorWolfgang Rosenauer <wr@rosenauer.org>
Mon, 20 Jun 2011 20:46:39 +0200
changeset 282 78a523efc513
parent 281 0bdc059f7280
child 283 418b5f502ff2
fix build for 12.1 and above by building dump_syms dynamic
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
MozillaFirefox/mozilla-dump_syms-static.patch file | annotate | diff | comparison | revisions
mozilla-dump_syms-static.patch file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.changes	Fri Jun 17 15:47:36 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Mon Jun 20 20:46:39 2011 +0200
@@ -1,8 +1,10 @@
 -------------------------------------------------------------------
-Fri Jun 17 13:13:47 UTC 2011 - wr@rosenauer.org
+Mon Jun 20 09:17:42 UTC 2011 - wr@rosenauer.org
 
 - update to 5.0b7
   * updated supported locales
+- do not build dump_syms static (not needed for us)
+  -> fix build for openSUSE 12.1 and above
 
 -------------------------------------------------------------------
 Wed Jun 15 14:59:32 UTC 2011 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Jun 17 15:47:36 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Jun 20 20:46:39 2011 +0200
@@ -73,6 +73,7 @@
 Patch10:        mozilla-ntlm-full-path.patch
 Patch11:        mozilla-ppc-ipc.patch
 Patch12:        mozilla-repo.patch
+Patch13:        mozilla-dump_syms-static.patch
 # Firefox/browser
 Patch30:        firefox-linkorder.patch
 Patch31:        firefox-browser-css.patch
@@ -204,6 +205,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 #
 %patch30 -p1
 %patch31 -p1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-dump_syms-static.patch	Mon Jun 20 20:46:39 2011 +0200
@@ -0,0 +1,1 @@
+../mozilla-dump_syms-static.patch
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-dump_syms-static.patch	Mon Jun 20 20:46:39 2011 +0200
@@ -0,0 +1,20 @@
+# HG changeset patch
+# Parent e589abb2c4d6aaa6083d254416211ac90360dbdd
+NO-BUG: Ignore a hack which is not needed in distribution build environments.
+
+diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
++++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+@@ -59,11 +59,11 @@ HOST_LIBS += \
+   $(NULL)
+ 
+ # force C++ linking
+ CPP_PROG_LINK = 1
+ FORCE_USE_PIC = 1
+ 
+ #XXX: bug 554854 causes us to be unable to run binaries on the build slaves
+ # due to them having an older libstdc++
+-HOST_LDFLAGS += -static
++#HOST_LDFLAGS += -static
+ 
+ include $(topsrcdir)/config/rules.mk
--- a/series	Fri Jun 17 15:47:36 2011 +0200
+++ b/series	Mon Jun 20 20:46:39 2011 +0200
@@ -17,6 +17,7 @@
 mozilla-ntlm-full-path.patch
 mozilla-ppc-ipc.patch
 mozilla-repo.patch
+mozilla-dump_syms-static.patch
 
 # Firefox patches
 firefox-linkorder.patch
mozilla