Changeset 150326 in webkit


Ignore:
Timestamp:
May 18, 2013 12:19:37 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] Parallel build fails if gtk-doc is enabled
https://bugs.webkit.org/show_bug.cgi?id=116227

Patch by Alberto Garcia <agarcia@igalia.com> on 2013-05-18
Reviewed by Martin Robinson.

.:

  • GNUmakefile.am:

Define an empty noinst_DATA variable where other automake files
can add additional objects to be built.

Source/WebCore:

  • GNUmakefile.am:

Don't overwrite noinst_DATA, modify its existing value instead.

Tools:

  • GNUmakefile.am:

Don't use the 'all' target to generate the documentation.
The prerequisites of this target must be files that need to be
built _before_ the actual compilation of WebKit starts. Since the
documentation depends on WebKit being built first, this means in
practice that the code will be built in parallel with the
generation of its dependencies, potentially making the build fail.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r150192 r150326  
     12013-05-18  Alberto Garcia  <agarcia@igalia.com>
     2
     3        [GTK] Parallel build fails if gtk-doc is enabled
     4        https://bugs.webkit.org/show_bug.cgi?id=116227
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am:
     9        Define an empty noinst_DATA variable where other automake files
     10        can add additional objects to be built.
     11
    1122013-05-16  Martin Robinson  <mrobinson@igalia.com>
    213
  • trunk/GNUmakefile.am

    r150074 r150326  
    5151noinst_PROGRAMS :=
    5252libexec_PROGRAMS :=
     53noinst_DATA :=
    5354noinst_HEADERS :=
    5455noinst_LTLIBRARIES :=
  • trunk/Source/WebCore/ChangeLog

    r150321 r150326  
     12013-05-18  Alberto Garcia  <agarcia@igalia.com>
     2
     3        [GTK] Parallel build fails if gtk-doc is enabled
     4        https://bugs.webkit.org/show_bug.cgi?id=116227
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am:
     9        Don't overwrite noinst_DATA, modify its existing value instead.
     10
    1112013-05-17  Michelangelo De Simone  <michelangelo@webkit.org>
    212
  • trunk/Source/WebCore/GNUmakefile.am

    r150074 r150326  
    730730# It seems that $(shell) does not expand when it is a rule dependency, so
    731731# we must redefine this list of copied files with traditional dependency wildcards.
    732 noinst_DATA = ${GENSOURCES_INSPECTOR}/inspector.html
     732noinst_DATA += ${GENSOURCES_INSPECTOR}/inspector.html
    733733${GENSOURCES_INSPECTOR}/inspector.html: $(WebCore)/inspector/front-end/*.html \
    734734                $(WebCore)/inspector/front-end/*.js \
  • trunk/Tools/ChangeLog

    r150324 r150326  
     12013-05-18  Alberto Garcia  <agarcia@igalia.com>
     2
     3        [GTK] Parallel build fails if gtk-doc is enabled
     4        https://bugs.webkit.org/show_bug.cgi?id=116227
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am:
     9        Don't use the 'all' target to generate the documentation.
     10        The prerequisites of this target must be files that need to be
     11        built _before_ the actual compilation of WebKit starts. Since the
     12        documentation depends on WebKit being built first, this means in
     13        practice that the code will be built in parallel with the
     14        generation of its dependencies, potentially making the build fail.
     15
    1162013-05-17  Ryosuke Niwa  <rniwa@webkit.org>
    217
  • trunk/Tools/GNUmakefile.am

    r150117 r150326  
    426426
    427427if ENABLE_GTK_DOC
    428 all: docs-build.stamp
    429 endif
    430 
     428noinst_DATA += docs-build.stamp
     429endif
     430
Note: See TracChangeset for help on using the changeset viewer.