Changeset 29701 in webkit


Ignore:
Timestamp:
Jan 21, 2008 3:06:23 PM (16 years ago)
Author:
alp@webkit.org
Message:

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

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r29670 r29701  
     12008-01-21  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=16955
     6        Get errors when cross-compile webkit-gtk
     7
     8        * GNUmakefile.am: added ICU_CPPFLAGS
     9        * configure.ac: added ICU_CPPFLAGS, removed ICU_CFLAGS
     10
    1112008-01-19  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
    212
  • trunk/GNUmakefile.am

    r29505 r29701  
    9595        $(javascriptcore_sources)
    9696
    97 libJavaScriptCore_la_LDFLAGS = -lpthread
     97libJavaScriptCore_la_LDFLAGS = $(ICU_LIBS) -lpthread
    9898
    9999libJavaScriptCore_la_CXXFLAGS = $(global_cflags) -fstrict-aliasing
     
    101101libJavaScriptCore_la_CFLAGS = $(global_cflags) -fstrict-aliasing
    102102
    103 libJavaScriptCore_la_CPPFLAGS = $(global_cppflags) $(javascriptcore_cppflags)
     103libJavaScriptCore_la_CPPFLAGS = \
     104        $(global_cppflags) \
     105        $(javascriptcore_cppflags) \
     106        $(ICU_CPPFLAGS)
    104107
    105108#
     
    158161        $(global_cppflags) \
    159162        $(webcore_cppflags) \
    160         $(webkitgtk_cppflags)
     163        $(webkitgtk_cppflags) \
     164        $(ICU_CPPFLAGS)
    161165
    162166libWebKitGtk_la_LIBADD = libJavaScriptCore.la
  • trunk/JavaScriptCore/ChangeLog

    r29663 r29701  
     12008-01-21  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=16955
     6        Get errors when cross-compile webkit-gtk
     7
     8        * GNUmakefile.am: removed ICU_CFLAGS
     9
    1102008-01-18  Kevin McCullough  <kmccullough@apple.com>
    211
  • trunk/JavaScriptCore/GNUmakefile.am

    r29445 r29701  
    150150        JavaScriptCore/API/minidom.c
    151151Programs_minidom_CPPFLAGS = $(global_cppflags)
    152 Programs_minidom_CXXFLAGS = $(global_cflags) $(ICU_CFLAGS)
    153 Programs_minidom_LDADD = $(ICU_LIBS) libJavaScriptCore.la
     152Programs_minidom_CXXFLAGS = $(global_cflags)
     153Programs_minidom_LDADD = libJavaScriptCore.la
    154154Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs
    155155
     
    157157Programs_testkjs_SOURCES = JavaScriptCore/kjs/testkjs.cpp
    158158Programs_testkjs_CPPFLAGS = $(global_cppflags)
    159 Programs_testkjs_CXXFLAGS = $(global_cflags) $(ICU_CFLAGS)
    160 Programs_testkjs_LDADD = $(ICU_LIBS) libJavaScriptCore.la
     159Programs_testkjs_CXXFLAGS = $(global_cflags)
     160Programs_testkjs_LDADD = libJavaScriptCore.la
    161161Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs
    162162
  • trunk/WebKitTools/ChangeLog

    r29694 r29701  
     12008-01-21  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=16955
     6        Get errors when cross-compile webkit-gtk
     7
     8        * GNUmakefile.am: Removed ICU_CFLAGS
     9
    1102008-01-21  Darin Adler  <darin@apple.com>
    211
  • trunk/WebKitTools/GNUmakefile.am

    r29445 r29701  
    1313Programs_GtkLauncher_CFLAGS = \
    1414        $(DEPENDENCIES_CFLAGS) \
    15         $(ICU_CFLAGS) \
    16         $(SQLITE3_CFLAGS) \
    17         $(GSTREAMER_CFLAGS) \
    18         $(LIBXSLT_CFLAGS)
     15        $(global_cflags)
    1916
    2017Programs_GtkLauncher_LDADD = \
    2118        $(DEPENDENCIES_LIBS) \
    22         $(ICU_LIBS) \
    23         $(SQLITE3_LIBS) \
    24         $(GSTREAMER_LIBS) \
    25         $(LIBXSLT_LIBS) \
    2619        libJavaScriptCore.la \
    2720        libWebKitGtk.la
     
    4538        WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
    4639
    47 Programs_DumpRenderTree_CXXFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CXXFLAGS)
    48 Programs_DumpRenderTree_LDADD = $(DEPENDENCIES_LIBS) libJavaScriptCore.la libWebKitGtk.la
     40Programs_DumpRenderTree_CXXFLAGS = \
     41        $(DEPENDENCIES_CFLAGS) \
     42        $(global_cflags)
     43
     44Programs_DumpRenderTree_LDADD = \
     45        $(DEPENDENCIES_LIBS) \
     46        libJavaScriptCore.la \
     47        libWebKitGtk.la
     48
    4949Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs
  • trunk/configure.ac

    r29670 r29701  
    130130   AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.])
    131131fi
    132 ICU_CFLAGS=`$icu_config --cflags`
     132
     133# We don't use --cflags as this gives us a lot of things that we don't
     134# necessarily want, like debugging and optimization flags
     135# See man (1) icu-config for more info.
     136ICU_CPPFLAGS=`$icu_config --cppflags`
    133137ICU_LIBS=`$icu_config --ldflags`
    134 AC_SUBST([ICU_CFLAGS])
     138AC_SUBST([ICU_CPPFLAGS])
    135139AC_SUBST([ICU_LIBS])
    136140
Note: See TracChangeset for help on using the changeset viewer.