Changeset 30459 in webkit


Ignore:
Timestamp:
Feb 21, 2008 11:43:44 AM (16 years ago)
Author:
alp@webkit.org
Message:

2008-02-21 Mike Auty <mike.auty@gmail.com>

Reviewed by Alp Toker.

http://bugs.webkit.org/show_bug.cgi?id=17445
[GTK] WebKit doesn't compile with LDFLAGS="-Wl,--as-needed"

The GNUmakefile.am files make use of the LDFLAGS variable to include library
additions such as -ljpeg etc. Unfortunately, if these inclusions aren't made
in LIBADD/LDADD variables, then they are mis-ordered during the linking.

The as-needed flag discards libraries whose functions have not been needed by
earlier libraries, which therefore makes the ordering important.

This moves all -l library inclusion statements from LDFLAGS variables to
LIBADD/LDADD variables.

  • GNUmakefile.am:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r30291 r30459  
     12008-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
    1202008-02-15  Alp Toker  <alp@atoker.com>
    221
  • trunk/GNUmakefile.am

    r30175 r30459  
    103103        $(javascriptcore_sources)
    104104
    105 libJavaScriptCore_la_LDFLAGS = $(ICU_LIBS) -lpthread
     105libJavaScriptCore_la_LIBADD = $(ICU_LIBS) -lpthread
    106106
    107107libJavaScriptCore_la_CXXFLAGS = $(global_cxxflags) $(global_cflags) -fstrict-aliasing
     
    127127webkitgtk_sources :=
    128128webkitgtk_cppflags :=
    129 webkitgtk_ldflags :=
     129webkitgtk_libadd :=
    130130webkitgtk_built_sources :=
    131131webkitgtk_built_nosources :=
     
    177177        $(ICU_CPPFLAGS)
    178178
    179 libWebKitGtk_la_LIBADD = libJavaScriptCore.la
    180 
    181 libWebKitGtk_la_LDFLAGS = \
    182         $(webkitgtk_ldflags) \
     179libWebKitGtk_la_LIBADD = libJavaScriptCore.la \
     180        $(webkitgtk_libadd) \
    183181        $(DEPENDENCIES_LIBS) \
    184182        $(LIBCURL_LIBS) \
     
    187185        $(GSTREAMER_LIBS) \
    188186        $(LIBXSLT_LIBS) \
    189         $(COVERAGE_LDFLAGS) \
    190187        $(HILDON_LIBS) \
    191188        -lpthread \
    192         -ljpeg \
     189        -ljpeg
     190
     191libWebKitGtk_la_LDFLAGS = \
     192        $(COVERAGE_LDFLAGS) \
    193193        -version-info @LIBWEBKITGTK_VERSION@
    194194
     
    238238
    239239if ENABLE_VIDEO
    240 webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10
     240webkitgtk_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
    241241endif
    242242
  • trunk/WebKitTools/ChangeLog

    r30444 r30459  
     12008-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
    1222008-02-20  Brent Fulgham  <bfulgham@gmail.com>
    223
  • trunk/WebKitTools/GNUmakefile.am

    r29986 r30459  
    2020        libWebKitGtk.la
    2121
    22 Programs_GtkLauncher_LDFLAGS = -ljpeg -rpath $(CURDIR)/.libs
     22Programs_GtkLauncher_LDFLAGS = -rpath $(CURDIR)/.libs
    2323
    2424# DumpRenderTree
Note: See TracChangeset for help on using the changeset viewer.