Changeset 177885 in webkit

Timestamp:

Jan 5, 2015 12:12:55 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

webkit-gtk 2.3.3 fails on darwin/quartz due to duplicate symbols in WebCore
​https://bugs.webkit.org/show_bug.cgi?id=126821

Patch by Zan Dobersek <​zdobersek@igalia.com> on 2015-01-05
Reviewed by Carlos Garcia Campos.

• GNUmakefile.list.am: Simplify the logic for determining build

targets that are specific to windowing targets. Avoid nested target
checks and list all the additional build targets for each windowing
target - X11, Wayland, X11 and Wayland (i.e. the build targets that
are shared between the two configurations), Win32 and Quartz. This
avoids the current problems of building duplicate build targets on
Quartz, and also cleans up the list.

Location:

releases/WebKitGTK/webkit-2.4/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (3 diffs)

releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        webkit-gtk 2.3.3 fails on darwin/quartz due to duplicate symbols in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=126821
+
+        Reviewed by Carlos Garcia Campos.
+
+        * GNUmakefile.list.am: Simplify the logic for determining build
+        targets that are specific to windowing targets. Avoid nested target
+        checks and list all the additional build targets for each windowing
+        target - X11, Wayland, X11 and Wayland (i.e. the build targets that
+        are shared between the two configurations), Win32 and Quartz. This
+        avoids the current problems of building duplicate build targets on
+        Quartz, and also cleans up the list.
+
 2014-10-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am

@@ -6252 +6252 @@
         Source/WebCore/platform/graphics/glx/GLContextGLX.h
 endif # END USE_GLX
-else
+endif # END TARGET_X11
+
+if TARGET_WAYLAND
 webcore_sources += \
         Source/WebCore/plugins/PluginPackageNone.cpp \
         Source/WebCore/plugins/PluginViewNone.cpp
-endif # END TARGET_X11
+endif # END TARGET_WAYLAND
 
 if TARGET_X11_OR_WAYLAND
@@ -6274 +6276 @@
         Source/WebCore/platform/graphics/egl/GLContextEGL.h
 endif # END USE_EGL
-else
+endif # END TARGET_X11_OR_WAYLAND
+
 if TARGET_WIN32
 webcore_sources += \
@@ -6300 +6303 @@
         Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
         Source/WebCore/plugins/win/PluginViewWin.cpp
-else
+endif # END TARGET_WIN32
+
+if TARGET_QUARTZ
 webcore_sources += \
         Source/WebCore/plugins/PluginPackageNone.cpp \
         Source/WebCore/plugins/PluginViewNone.cpp
-endif # END TARGET_WIN32
-endif # END TARGET_X11_OR_WAYLAND
+endif # END TARGET_QUARTZ
 
 if USE_GLES2