Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-3.5-asneeded.patch
Parent Directory | Revision Log
Revision 867 -
(hide annotations)
(download)
Sat Jul 11 13:44:14 2009 UTC (15 years, 2 months ago) by niro
File size: 1278 byte(s)
Sat Jul 11 13:44:14 2009 UTC (15 years, 2 months ago) by niro
File size: 1278 byte(s)
-patches for mozilla-firefox-3.5
1 | niro | 867 | b=490813; linker error in browser/components/build with --as-needed |
2 | |||
3 | Gentoo bug 267900 | ||
4 | diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in | ||
5 | --- a/browser/components/build/Makefile.in | ||
6 | +++ b/browser/components/build/Makefile.in | ||
7 | @@ -65,11 +65,7 @@ | ||
8 | SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX) | ||
9 | endif | ||
10 | |||
11 | -EXTRA_DSO_LDOPTS += \ | ||
12 | - $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \ | ||
13 | - $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ | ||
14 | - $(MOZ_COMPONENT_LIBS) \ | ||
15 | - $(NULL) | ||
16 | +EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) | ||
17 | |||
18 | # migration requires mozreg, which doesn't build on WINCE; only include | ||
19 | # it on non-CE | ||
20 | @@ -80,6 +76,13 @@ | ||
21 | EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) | ||
22 | endif | ||
23 | |||
24 | +# This has to come after the above chunk, because mozreg_s has dependencies on | ||
25 | +# stuff in MOZ_COMPONENT_LIBS. | ||
26 | +EXTRA_DSO_LDOPTS += \ | ||
27 | + $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ | ||
28 | + $(MOZ_COMPONENT_LIBS) \ | ||
29 | + $(NULL) | ||
30 | + | ||
31 | # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code) | ||
32 | # GTK2: Need to link with glib for GNOME shell service | ||
33 | ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT))) |