From 604f11acb330b8326abd1278f569ca3cfd2cf1d1 Mon Sep 17 00:00:00 2001 From: "alp@webkit.org" Date: Mon, 21 Jan 2008 23:06:23 +0000 Subject: [PATCH 1/1] 2008-01-21 Jan Michael Alonzo 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 --- ChangeLog | 10 ++++++++++ GNUmakefile.am | 10 +++++++--- JavaScriptCore/ChangeLog | 9 +++++++++ JavaScriptCore/GNUmakefile.am | 8 ++++---- WebKitTools/ChangeLog | 9 +++++++++ WebKitTools/GNUmakefile.am | 20 ++++++++++---------- configure.ac | 8 ++++++-- 7 files changed, 55 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 291b617..254a202 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-01-21 Jan Michael Alonzo + + 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 Reviewed by Alp Toker. diff --git a/GNUmakefile.am b/GNUmakefile.am index 27226b8..2cb342f 100644 --- 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 8264083..b2f6a54 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,12 @@ +2008-01-21 Jan Michael Alonzo + + 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 - Build fix. diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am index 52f7d0d..f20f302 100644 --- 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 620647e..2fb13f1 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,12 @@ +2008-01-21 Jan Michael Alonzo + + 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 Reviewed by Mitz and Adam. diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am index e070587..f211ee6 100644 --- 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 5e2453e..1a7dc57 100644 --- 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 -- 1.8.3.1