Changeset 160482 in webkit


Ignore:
Timestamp:
Dec 12, 2013 2:10:36 AM (10 years ago)
Author:
zandobersek@gmail.com
Message:

Use of ar T option not supported by older binutils
​https://bugs.webkit.org/show_bug.cgi?id=118732

Reviewed by Gustavo Noronha Silva.

.:

  • Source/autotools/SetupLibtool.m4: Make the AR_FLAGS value usable inside makefiles as an Automake variable.

Source/WebKit2:

  • GNUmakefile.am: To support non-thin archives when generating the WebCoreLayerGtk2 archive,

switch to using the AR_FLAGS variable (which can be overridden) for providing the ar flags for the
new archive. Non-thin archives also pose the problem as their members are only noted by the basename
of the member's object file, and not the full path to it. To work around that, all the object files
under the build directory are listed by their relative paths. The members of various archives then have
the basenames of their paths grepped against that list, with the found path correlating to the member
finally added as the new member of the WebCoreLayerGtk2 archive.

Tools:

  • TestWebKitAPI/GNUmakefile.am: To support non-thin archives when generating the WebCoreLayer archive,

switch to using the AR_FLAGS variable (which can be overridden) for providing the ar flags for the
new archive. Non-thin archives also pose the problem as their members are only noted by the basename
of the member's object file, and not the full path to it. To work around that, all the object files
under the build directory are listed by their relative paths. The members of various archives then have
the basenames of their paths grepped against that list, with the found path correlating to the member
finally added as the new member of the WebCoreLayer archive.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r160441 r160482  
     12013-12-12  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Use of ar T option not supported by older binutils
     4        https://bugs.webkit.org/show_bug.cgi?id=118732
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * Source/autotools/SetupLibtool.m4: Make the AR_FLAGS value usable inside makefiles as an Automake variable.
     9
    1102013-12-11  Javier Fernandez  <jfernandez@igalia.com>
    211

  • trunk/Source/WebKit2/ChangeLog

    r160481 r160482  
     12013-12-12  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Use of ar T option not supported by older binutils
     4        https://bugs.webkit.org/show_bug.cgi?id=118732
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * GNUmakefile.am: To support non-thin archives when generating the WebCoreLayerGtk2 archive,
     9        switch to using the AR_FLAGS variable (which can be overridden) for providing the ar flags for the
     10        new archive. Non-thin archives also pose the problem as their members are only noted by the basename
     11        of the member's object file, and not the full path to it. To work around that, all the object files
     12        under the build directory are listed by their relative paths. The members of various archives then have
     13        the basenames of their paths grepped against that list, with the found path correlating to the member
     14        finally added as the new member of the WebCoreLayerGtk2 archive.
     15
    1162013-12-12  Carlos Garcia Campos  <cgarcia@igalia.com>
    217

  • trunk/Source/WebKit2/GNUmakefile.am

    r160444 r160482  
    668668        $(AM_V_GEN)
    669669        $(AM_V_at)$(shell rm -f $@)
    670         $(AM_V_at)$(foreach archive, $(webcore_layer_gtk2_archives), $(shell ar t $(archive) | xargs -n50 ar cruT $@))
     670        $(AM_V_at)$(shell find . -name "*.o" > objects_list)
     671        $(AM_V_at)$(foreach archive, $(webcore_layer_gtk2_archives), $(shell $(AR) t $(archive) | xargs -n1 basename | xargs -I obj_file grep -F obj_file objects_list | xargs -n50 $(AR) $(AR_FLAGS) $@))
     672        $(AM_V_at)$(shell rm -f objects_list)
    671673
    672674DISTCLEANFILES += \

  • trunk/Source/autotools/SetupLibtool.m4

    r143001 r160482  
    99    AR_FLAGS="cruT"
    1010fi
     11AC_SUBST([AR_FLAGS])
    1112
    1213DOLT

  • trunk/Tools/ChangeLog

    r160466 r160482  
     12013-12-12  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Use of ar T option not supported by older binutils
     4        https://bugs.webkit.org/show_bug.cgi?id=118732
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * TestWebKitAPI/GNUmakefile.am: To support non-thin archives when generating the WebCoreLayer archive,
     9        switch to using the AR_FLAGS variable (which can be overridden) for providing the ar flags for the
     10        new archive. Non-thin archives also pose the problem as their members are only noted by the basename
     11        of the member's object file, and not the full path to it. To work around that, all the object files
     12        under the build directory are listed by their relative paths. The members of various archives then have
     13        the basenames of their paths grepped against that list, with the found path correlating to the member
     14        finally added as the new member of the WebCoreLayer archive.
     15
    1162013-12-11  Myles C. Maxfield  <mmaxfield@apple.com>
    217

  • trunk/Tools/TestWebKitAPI/GNUmakefile.am

    r158689 r160482  
    125125        $(AM_V_GEN)
    126126        $(AM_V_at)$(shell rm -f $@)
    127         $(AM_V_at)$(foreach archive, $(webcore_layer_archives), $(shell ar t $(archive) | xargs -n50 ar cruT $@))
     127        $(AM_V_at)$(shell find . -name "*.o" > objects_list)
     128        $(AM_V_at)$(foreach archive, $(webcore_layer_archives), $(shell $(AR) t $(archive) | xargs -n1 basename | xargs -I obj_file grep -F obj_file objects_list | xargs -n50 $(AR) $(AR_FLAGS) $@))
     129        $(AM_V_at)$(shell rm -f objects_list)
    128130
    129131DISTCLEANFILES += \
Note: See TracChangeset for help on using the changeset viewer.