Title: [150326] trunk
- Revision
- 150326
- Author
- [email protected]
- Date
- 2013-05-18 00:19:37 -0700 (Sat, 18 May 2013)
Log Message
[GTK] Parallel build fails if gtk-doc is enabled
https://bugs.webkit.org/show_bug.cgi?id=116227
Patch by Alberto Garcia <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (150325 => 150326)
--- trunk/ChangeLog 2013-05-18 07:12:01 UTC (rev 150325)
+++ trunk/ChangeLog 2013-05-18 07:19:37 UTC (rev 150326)
@@ -1,3 +1,14 @@
+2013-05-18 Alberto Garcia <[email protected]>
+
+ [GTK] Parallel build fails if gtk-doc is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=116227
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am:
+ Define an empty noinst_DATA variable where other automake files
+ can add additional objects to be built.
+
2013-05-16 Martin Robinson <[email protected]>
[GTK] [CMake] Disable the shadow DOM
Modified: trunk/GNUmakefile.am (150325 => 150326)
--- trunk/GNUmakefile.am 2013-05-18 07:12:01 UTC (rev 150325)
+++ trunk/GNUmakefile.am 2013-05-18 07:19:37 UTC (rev 150326)
@@ -50,6 +50,7 @@
bin_PROGRAMS :=
noinst_PROGRAMS :=
libexec_PROGRAMS :=
+noinst_DATA :=
noinst_HEADERS :=
noinst_LTLIBRARIES :=
lib_LTLIBRARIES :=
Modified: trunk/Source/WebCore/ChangeLog (150325 => 150326)
--- trunk/Source/WebCore/ChangeLog 2013-05-18 07:12:01 UTC (rev 150325)
+++ trunk/Source/WebCore/ChangeLog 2013-05-18 07:19:37 UTC (rev 150326)
@@ -1,3 +1,13 @@
+2013-05-18 Alberto Garcia <[email protected]>
+
+ [GTK] Parallel build fails if gtk-doc is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=116227
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am:
+ Don't overwrite noinst_DATA, modify its existing value instead.
+
2013-05-17 Michelangelo De Simone <[email protected]>
CSSParser parsing of CSSPropertyFontStretch falls into CSSPropertyGeometry
Modified: trunk/Source/WebCore/GNUmakefile.am (150325 => 150326)
--- trunk/Source/WebCore/GNUmakefile.am 2013-05-18 07:12:01 UTC (rev 150325)
+++ trunk/Source/WebCore/GNUmakefile.am 2013-05-18 07:19:37 UTC (rev 150326)
@@ -729,7 +729,7 @@
# It seems that $(shell) does not expand when it is a rule dependency, so
# we must redefine this list of copied files with traditional dependency wildcards.
-noinst_DATA = ${GENSOURCES_INSPECTOR}/inspector.html
+noinst_DATA += ${GENSOURCES_INSPECTOR}/inspector.html
${GENSOURCES_INSPECTOR}/inspector.html: $(WebCore)/inspector/front-end/*.html \
$(WebCore)/inspector/front-end/*.js \
$(WebCore)/inspector/front-end/UglifyJS/*.js \
Modified: trunk/Tools/ChangeLog (150325 => 150326)
--- trunk/Tools/ChangeLog 2013-05-18 07:12:01 UTC (rev 150325)
+++ trunk/Tools/ChangeLog 2013-05-18 07:19:37 UTC (rev 150326)
@@ -1,3 +1,18 @@
+2013-05-18 Alberto Garcia <[email protected]>
+
+ [GTK] Parallel build fails if gtk-doc is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=116227
+
+ Reviewed by Martin Robinson.
+
+ * 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.
+
2013-05-17 Ryosuke Niwa <[email protected]>
Don't run hg.
Modified: trunk/Tools/GNUmakefile.am (150325 => 150326)
--- trunk/Tools/GNUmakefile.am 2013-05-18 07:12:01 UTC (rev 150325)
+++ trunk/Tools/GNUmakefile.am 2013-05-18 07:19:37 UTC (rev 150326)
@@ -425,6 +425,6 @@
endif
if ENABLE_GTK_DOC
-all: docs-build.stamp
+noinst_DATA += docs-build.stamp
endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
