Changeset 30459 in webkit
- Timestamp:
- Feb 21, 2008 11:43:44 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r30291 r30459 1 2008-02-21 Mike Auty <mike.auty@gmail.com> 2 3 Reviewed by Alp Toker. 4 5 http://bugs.webkit.org/show_bug.cgi?id=17445 6 [GTK] WebKit doesn't compile with LDFLAGS="-Wl,--as-needed" 7 8 The GNUmakefile.am files make use of the LDFLAGS variable to include library 9 additions such as -ljpeg etc. Unfortunately, if these inclusions aren't made 10 in LIBADD/LDADD variables, then they are mis-ordered during the linking. 11 12 The as-needed flag discards libraries whose functions have not been needed by 13 earlier libraries, which therefore makes the ordering important. 14 15 This moves all -l library inclusion statements from LDFLAGS variables to 16 LIBADD/LDADD variables. 17 18 * GNUmakefile.am: 19 1 20 2008-02-15 Alp Toker <alp@atoker.com> 2 21 -
trunk/GNUmakefile.am
r30175 r30459 103 103 $(javascriptcore_sources) 104 104 105 libJavaScriptCore_la_L DFLAGS= $(ICU_LIBS) -lpthread105 libJavaScriptCore_la_LIBADD = $(ICU_LIBS) -lpthread 106 106 107 107 libJavaScriptCore_la_CXXFLAGS = $(global_cxxflags) $(global_cflags) -fstrict-aliasing … … 127 127 webkitgtk_sources := 128 128 webkitgtk_cppflags := 129 webkitgtk_l dflags:=129 webkitgtk_libadd := 130 130 webkitgtk_built_sources := 131 131 webkitgtk_built_nosources := … … 177 177 $(ICU_CPPFLAGS) 178 178 179 libWebKitGtk_la_LIBADD = libJavaScriptCore.la 180 181 libWebKitGtk_la_LDFLAGS = \ 182 $(webkitgtk_ldflags) \ 179 libWebKitGtk_la_LIBADD = libJavaScriptCore.la \ 180 $(webkitgtk_libadd) \ 183 181 $(DEPENDENCIES_LIBS) \ 184 182 $(LIBCURL_LIBS) \ … … 187 185 $(GSTREAMER_LIBS) \ 188 186 $(LIBXSLT_LIBS) \ 189 $(COVERAGE_LDFLAGS) \190 187 $(HILDON_LIBS) \ 191 188 -lpthread \ 192 -ljpeg \ 189 -ljpeg 190 191 libWebKitGtk_la_LDFLAGS = \ 192 $(COVERAGE_LDFLAGS) \ 193 193 -version-info @LIBWEBKITGTK_VERSION@ 194 194 … … 238 238 239 239 if ENABLE_VIDEO 240 webkitgtk_l dflags+= -lgstinterfaces-0.10 -lgstvideo-0.10240 webkitgtk_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10 241 241 endif 242 242 -
trunk/WebKitTools/ChangeLog
r30444 r30459 1 2008-02-21 Mike Auty <mike.auty@gmail.com> 2 3 Reviewed by Alp Toker. 4 5 http://bugs.webkit.org/show_bug.cgi?id=17445 6 [GTK] WebKit doesn't compile with LDFLAGS="-Wl,--as-needed" 7 8 GTK+/autotools build system improvements 9 10 The GNUmakefile.am files make use of the LDFLAGS variable to include library 11 additions such as -ljpeg etc. Unfortunately, if these inclusions aren't made 12 in LIBADD/LDADD variables, then they are mis-ordered during the linking. 13 14 The as-needed flag discards libraries whose functions have not been needed by 15 earlier libraries, which therefore makes the ordering important. 16 17 This moves all -l library inclusion statements from LDFLAGS variables to 18 LIBADD/LDADD variables. 19 20 * GNUmakefile.am: 21 1 22 2008-02-20 Brent Fulgham <bfulgham@gmail.com> 2 23 -
trunk/WebKitTools/GNUmakefile.am
r29986 r30459 20 20 libWebKitGtk.la 21 21 22 Programs_GtkLauncher_LDFLAGS = - ljpeg -rpath $(CURDIR)/.libs22 Programs_GtkLauncher_LDFLAGS = -rpath $(CURDIR)/.libs 23 23 24 24 # DumpRenderTree
Note: See TracChangeset
for help on using the changeset viewer.