2008-09-19 Alp Toker <alp@nuanti.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 20 Sep 2008 06:34:35 +0000 (06:34 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 20 Sep 2008 06:34:35 +0000 (06:34 +0000)
        Build fix for the 'gold' linker and recent binutils. New behaviour
        requires that we link to used libraries explicitly.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@36705 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
JavaScriptCore/ChangeLog
JavaScriptCore/GNUmakefile.am
WebKitTools/ChangeLog
WebKitTools/GNUmakefile.am
configure.ac

index 96f599f..7bc9dd4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-19  Alp Toker  <alp@nuanti.com>
+
+        Build fix for the 'gold' linker and recent binutils. New behaviour
+        requires that we link to used libraries explicitly.
+
+        * GNUmakefile.am:
+        * configure.ac:
+
 2008-09-04  Marco Barisione  <marco.barisione@collabora.co.uk>
 
         Reviewed by Eric Seidel.
index e274289..458b854 100644 (file)
@@ -123,12 +123,8 @@ libJavaScriptCore_la_LIBADD = \
        -lpthread
 
 libJavaScriptCore_la_CXXFLAGS = \
-       -fstrict-aliasing \
-       -O3 \
        $(global_cxxflags) \
-       $(global_cflags) \
-       $(GLOBALDEPS_CFLAGS) \
-       $(UNICODE_CFLAGS)
+       $(libJavaScriptCore_la_CFLAGS)
 
 libJavaScriptCore_la_CFLAGS = \
        -fstrict-aliasing \
@@ -160,22 +156,8 @@ libWebCore_la_SOURCES = \
        $(webcoregtk_sources)
 
 libWebCore_la_CXXFLAGS = \
-       -fno-strict-aliasing \
-       -O2 \
        $(global_cxxflags) \
-       $(global_cflags) \
-       $(GLOBALDEPS_CFLAGS) \
-       $(UNICODE_CFLAGS) \
-       $(WEBKITDEPS_CFLAGS) \
-       $(XT_CFLAGS) \
-       $(LIBCURL_CFLAGS) \
-       $(LIBSOUP_CFLAGS) \
-       $(FREETYPE_CFLAGS) \
-       $(SQLITE3_CFLAGS) \
-       $(GSTREAMER_CFLAGS) \
-       $(LIBXSLT_CFLAGS) \
-       $(COVERAGE_CFLAGS) \
-       $(HILDON_CFLAGS)
+       $(libWebCore_la_CFLAGS)
 
 libWebCore_la_CFLAGS = \
        -fno-strict-aliasing \
@@ -183,7 +165,10 @@ libWebCore_la_CFLAGS = \
        $(global_cflags) \
        $(GLOBALDEPS_CFLAGS) \
        $(UNICODE_CFLAGS) \
-       $(WEBKITDEPS_CFLAGS) \
+       $(LIBXML_CFLAGS) \
+       $(CAIRO_CFLAGS) \
+       $(PANGO_CFLAGS) \
+       $(GTK_CFLAGS) \
        $(XT_CFLAGS) \
        $(LIBCURL_CFLAGS) \
        $(LIBSOUP_CFLAGS) \
@@ -205,7 +190,10 @@ libWebCore_la_LIBADD = \
        libJavaScriptCore.la \
        $(webcore_libadd) \
        $(GLOBALDEPS_LIBS) \
-       $(WEBKITDEPS_LIBS) \
+       $(LIBXML_LIBS) \
+       $(CAIRO_LIBS) \
+       $(PANGO_LIBS) \
+       $(GTK_LIBS) \
        $(XT_LIBS) \
        $(LIBCURL_LIBS) \
        $(LIBSOUP_LIBS) \
index e417843..8289670 100644 (file)
@@ -1,3 +1,10 @@
+2008-09-19  Alp Toker  <alp@nuanti.com>
+
+        Build fix for the 'gold' linker and recent binutils. New behaviour
+        requires that we link to used libraries explicitly.
+
+        * GNUmakefile.am:
+
 2008-09-19  Sam Weinig  <sam@webkit.org>
 
         Roll r36694 back in.  It did not cause the crash.
index 87c22cc..0a3d08a 100644 (file)
@@ -419,15 +419,9 @@ Programs_minidom_CFLAGS = \
        $(global_cflags) \
        $(GLOBALDEPS_CFLAGS)
 
-Programs_minidom_CXXFLAGS = \
-       -fno-strict-aliasing \
-       -O2 \
-       $(global_cxxflags) \
-       $(global_cflags) \
-       $(GLOBALDEPS_CFLAGS)
-
 Programs_minidom_LDADD = \
         libJavaScriptCore.la \
+        -lm \
         -lstdc++
 
 # jsc
index d8e78a1..4053bf6 100644 (file)
@@ -1,3 +1,10 @@
+2008-09-19  Alp Toker  <alp@nuanti.com>
+
+        Build fix for the 'gold' linker and recent binutils. New behaviour
+        requires that we link to used libraries explicitly.
+
+        * GNUmakefile.am:
+
 2008-09-19  Stephanie Lewis  <slewis@apple.com>
 
         Reviewed by Oliver Hunt.
index 961f5dc..aaf0c4f 100644 (file)
@@ -15,12 +15,12 @@ Programs_GtkLauncher_SOURCES = \
 Programs_GtkLauncher_CFLAGS = \
        -fno-strict-aliasing \
        -O2 \
-       $(GLOBALDEPS_CFLAGS) \
-       $(WEBKITDEPS_CFLAGS) \
-       $(global_cflags)
+       $(global_cflags) \
+       $(GTK_CFLAGS)
 
 Programs_GtkLauncher_LDADD = \
-       libwebkit-1.0.la
+       libwebkit-1.0.la \
+       $(GTK_LIBS)
 
 # DumpRenderTree
 Programs_DumpRenderTree_CPPFLAGS = \
@@ -52,15 +52,22 @@ Programs_DumpRenderTree_SOURCES = \
        WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
 
 Programs_DumpRenderTree_CXXFLAGS = \
+       $(global_cxxflags) \
+       $(Programs_DumpRenderTree_CFLAGS)
+
+Programs_DumpRenderTree_CFLAGS = \
        -fno-strict-aliasing \
        -O2 \
+       $(global_cflags) \
        $(GLOBALDEPS_CFLAGS) \
-       $(WEBKITDEPS_CFLAGS) \
-       $(global_cxxflags) \
-       $(global_cflags)
+       $(CAIRO_CFLAGS) \
+       $(GTK_CFLAGS)
 
 Programs_DumpRenderTree_LDADD = \
-       libwebkit-1.0.la
+       libwebkit-1.0.la \
+       $(GLOBALDEPS_LIBS) \
+       $(CAIRO_LIBS) \
+       $(GTK_LIBS)
 
 # clean target
 CLEANFILES += \
index 579891c..55dddbd 100644 (file)
@@ -280,13 +280,21 @@ PKG_CHECK_MODULES([GLOBALDEPS],
 AC_SUBST([GLOBALDEPS_CFLAGS])
 AC_SUBST([GLOBALDEPS_LIBS])
 
-PKG_CHECK_MODULES([WEBKITDEPS],
-                  [gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                  pango >= $PANGO_REQUIRED_VERSION
-                  cairo >= $CAIRO_REQUIRED_VERSION
-                  libxml-2.0 >= $LIBXML_REQUIRED_VERSION])
-AC_SUBST([WEBKITDEPS_CFLAGS])
-AC_SUBST([WEBKITDEPS_LIBS])
+PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
+AC_SUBST(LIBXML_CFLAGS)
+AC_SUBST(LIBXML_LIBS)
+
+PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION)
+AC_SUBST(CAIRO_CFLAGS)
+AC_SUBST(CAIRO_LIBS)
+
+PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED_VERSION)
+AC_SUBST(PANGO_CFLAGS)
+AC_SUBST(PANGO_LIBS)
+
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
 
 # check for Xt if the target is X11
 if test "$with_target" = "x11"; then