Attachment 187353 Details for Bug 109315 – Patch

[patch] Patch

bug-109315-20130208220400.patch (text/plain), 2.52 KB, created by Zan Dobersek on 2013-02-08 13:07:25 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2013-02-08 13:07:25 PST

Size: 2.52 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 142315)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2013-02-08  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        gtkdoc-scangobj throwing warnings when using Clang, causes generate-gtkdoc to fail
>+        https://bugs.webkit.org/show_bug.cgi?id=109315
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * GNUmakefile.am: Define the CC environment variable to the CC compiler that the whole
>+        project was configured to use. This ensures both the regular build and the gtkdoc-scangobj
>+        program use the same compiler.
>+        * gtk/generate-gtkdoc: Add '-Qunused-arguments' to the CFLAGS in case we're using Clang. This
>+        forces Clang to suppress unused arguments warnings that can unnecessarily cause generate-gtkdoc
>+        script to fail.
>+
> 2013-02-08  Roger Fong  <roger_fong@apple.com>
> 
>         DumpRenderTree, ImageDiff and TestNetscapePlugin projects, property sheets and resources for VS2010 solution.
>Index: Tools/GNUmakefile.am
>===================================================================
>--- Tools/GNUmakefile.am	(revision 142311)
>+++ Tools/GNUmakefile.am	(working copy)
>@@ -321,7 +321,7 @@ docs-build.stamp: \
> 	libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
> 	Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \
> 	Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
>-	$(srcdir)/Tools/gtk/generate-gtkdoc
>+	CC=$(CC) $(srcdir)/Tools/gtk/generate-gtkdoc
> 	@touch docs-build.stamp
> else
> docs-build.stamp: \
>@@ -329,7 +329,7 @@ docs-build.stamp: \
> 	Source/WebKit/gtk/docs/webkitenvironment.xml \
> 	Source/WebKit/gtk/docs/webkitgtk-docs.sgml \
> 	Source/WebKit/gtk/docs/webkitgtk-sections.txt
>-	$(srcdir)/Tools/gtk/generate-gtkdoc
>+	CC=$(CC) $(srcdir)/Tools/gtk/generate-gtkdoc
> 	@touch docs-build.stamp
> endif
> 
>Index: Tools/gtk/generate-gtkdoc
>===================================================================
>--- Tools/gtk/generate-gtkdoc	(revision 142311)
>+++ Tools/gtk/generate-gtkdoc	(working copy)
>@@ -172,6 +172,10 @@ cflags = os.environ.get('CFLAGS', '')
> cflags += ' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'
> os.environ['CFLAGS'] = cflags
> 
>+# Clang can be noisy, throwing unnecessary warnings for unused arguments.
>+if os.environ.get('CC') == "clang":
>+    os.environ['CFLAGS'] += ' -Qunused-arguments'
>+
> saw_webkit1_warnings = saw_webkit2_warnings = False
> 
> pkg_config_path = common.build_path('Source', 'WebKit', 'gtk', 'webkitgtk-3.0.pc')

Actions: View | Formatted Diff | Diff

Attachments on bug 109315: 187353