2008-01-21 Jan Michael Alonzo <jmalonzo@unpluggable.com>

        Reviewed by Alp Toker.

        http://bugs.webkit.org/show_bug.cgi?id=16955
        Get errors when cross-compile webkit-gtk

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

diff --git a/ChangeLog b/ChangeLog
index 291b617f850b2040f19a34787a308b35c43eeb91..254a2023fa7ffb986fbf97d558a6d8d64afe43ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-21  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16955
+        Get errors when cross-compile webkit-gtk
+
+        * GNUmakefile.am: added ICU_CPPFLAGS
+        * configure.ac: added ICU_CPPFLAGS, removed ICU_CFLAGS
+
 2008-01-19  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 
         Reviewed by Alp Toker.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 27226b86e5a8a8ed8511e077376f0968d3ffb6b0..2cb342f2634b85508a74b01b878d07b05cde16dd 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -94,13 +94,16 @@ libJavaScriptCore_la_SOURCES = \
        $(javascriptcore_built_sources) \
        $(javascriptcore_sources)
 
-libJavaScriptCore_la_LDFLAGS = -lpthread
+libJavaScriptCore_la_LDFLAGS = $(ICU_LIBS) -lpthread
 
 libJavaScriptCore_la_CXXFLAGS = $(global_cflags) -fstrict-aliasing
 
 libJavaScriptCore_la_CFLAGS = $(global_cflags) -fstrict-aliasing
 
-libJavaScriptCore_la_CPPFLAGS = $(global_cppflags) $(javascriptcore_cppflags)
+libJavaScriptCore_la_CPPFLAGS = \
+       $(global_cppflags) \
+       $(javascriptcore_cppflags) \
+       $(ICU_CPPFLAGS)
 
 #
 # WebCore
@@ -157,7 +160,8 @@ libWebKitGtk_la_CFLAGS = \
 libWebKitGtk_la_CPPFLAGS = \
        $(global_cppflags) \
        $(webcore_cppflags) \
-       $(webkitgtk_cppflags)
+       $(webkitgtk_cppflags) \
+       $(ICU_CPPFLAGS)
 
 libWebKitGtk_la_LIBADD = libJavaScriptCore.la
 

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 82640831e192201dbd1af53074fa75f49b488e62..b2f6a54cd11040367d175a95973ef8439237b86d 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-21  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16955
+        Get errors when cross-compile webkit-gtk
+
+        * GNUmakefile.am: removed ICU_CFLAGS
+
 2008-01-18  Kevin McCullough  <kmccullough@apple.com>
 
         - Build fix.

diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 52f7d0dcae10390963a67ce7e4e5a14e887ba40a..f20f3022cdc3a1cf78b557013994f1f42df7a56f 100644 (file)
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -149,15 +149,15 @@ Programs_minidom_SOURCES = \
        JavaScriptCore/API/NodeList.c \
        JavaScriptCore/API/minidom.c
 Programs_minidom_CPPFLAGS = $(global_cppflags)
-Programs_minidom_CXXFLAGS = $(global_cflags) $(ICU_CFLAGS)
-Programs_minidom_LDADD = $(ICU_LIBS) libJavaScriptCore.la
+Programs_minidom_CXXFLAGS = $(global_cflags)
+Programs_minidom_LDADD = libJavaScriptCore.la
 Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs
 
 # testkjs
 Programs_testkjs_SOURCES = JavaScriptCore/kjs/testkjs.cpp
 Programs_testkjs_CPPFLAGS = $(global_cppflags)
-Programs_testkjs_CXXFLAGS = $(global_cflags) $(ICU_CFLAGS)
-Programs_testkjs_LDADD = $(ICU_LIBS) libJavaScriptCore.la
+Programs_testkjs_CXXFLAGS = $(global_cflags)
+Programs_testkjs_LDADD = libJavaScriptCore.la
 Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs
 
 # Clean rules for JavaScriptCore

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 620647e104a717747d1fef12cdad6640147c73f3..2fb13f1d601e93b05f428bb5f08c2f96e6b3d789 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-21  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16955
+        Get errors when cross-compile webkit-gtk
+
+        * GNUmakefile.am: Removed ICU_CFLAGS 
+
 2008-01-21  Darin Adler  <darin@apple.com>
 
         Reviewed by Mitz and Adam.

diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index e07058762a433cb438dbe74f91ea5d0ddca375ac..f211ee69d63abff85d7258c02a71f9f44450d9b1 100644 (file)
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -12,17 +12,10 @@ Programs_GtkLauncher_SOURCES = \
 
 Programs_GtkLauncher_CFLAGS = \
        $(DEPENDENCIES_CFLAGS) \
-       $(ICU_CFLAGS) \
-       $(SQLITE3_CFLAGS) \
-       $(GSTREAMER_CFLAGS) \
-       $(LIBXSLT_CFLAGS)
+       $(global_cflags)
 
 Programs_GtkLauncher_LDADD = \
        $(DEPENDENCIES_LIBS) \
-       $(ICU_LIBS) \
-       $(SQLITE3_LIBS) \
-       $(GSTREAMER_LIBS) \
-       $(LIBXSLT_LIBS) \
        libJavaScriptCore.la \
        libWebKitGtk.la
 
@@ -44,6 +37,13 @@ Programs_DumpRenderTree_SOURCES = \
        WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \
        WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
 
-Programs_DumpRenderTree_CXXFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CXXFLAGS)
-Programs_DumpRenderTree_LDADD = $(DEPENDENCIES_LIBS) libJavaScriptCore.la libWebKitGtk.la
+Programs_DumpRenderTree_CXXFLAGS = \
+       $(DEPENDENCIES_CFLAGS) \
+       $(global_cflags)
+
+Programs_DumpRenderTree_LDADD = \
+       $(DEPENDENCIES_LIBS) \
+       libJavaScriptCore.la \
+       libWebKitGtk.la
+
 Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs 

diff --git a/configure.ac b/configure.ac
index 5e2453e7405aa1c954c7efcf359de0c1c40de320..1a7dc57c5944b7fa8b240483199a16e6285aa492 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -129,9 +129,13 @@ AC_PATH_PROG(icu_config, icu-config, no)
 if test "$icu_config" = "no"; then
    AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.])
 fi
-ICU_CFLAGS=`$icu_config --cflags`
+
+# We don't use --cflags as this gives us a lot of things that we don't
+# necessarily want, like debugging and optimization flags
+# See man (1) icu-config for more info.
+ICU_CPPFLAGS=`$icu_config --cppflags`
 ICU_LIBS=`$icu_config --ldflags`
-AC_SUBST([ICU_CFLAGS])
+AC_SUBST([ICU_CPPFLAGS])
 AC_SUBST([ICU_LIBS])
 
 # determine the GDK/GTK+ target