[oe-commits] org.oe.dev merge of 'a147eede058360494dc7116dfa7a3de17b92123b'
khem commit
oe at amethyst.openembedded.net
Sun May 4 08:16:44 UTC 2008
merge of 'a147eede058360494dc7116dfa7a3de17b92123b'
and 'd7e8ac4147edec9f5d58ed1abdde271e7d4c7b29'
Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: 44216bd9876fdfa1f84526d6aa26261db29e7710
ViewMTN: http://monotone.openembedded.org/revision/info/44216bd9876fdfa1f84526d6aa26261db29e7710
Files:
1
packages/webkit/webkit-gtk
packages/webkit/webkit-gtk/GNUmakefile.am
packages/webkit/webkit-gtk/Makefile
packages/webkit/webkit-gtk/Makefile.shared
packages/webkit/webkit-gtk/WebKit.pri
packages/webkit/webkit-gtk/WebKit.pro
packages/webkit/webkit-gtk/autogen.sh
packages/webkit/webkit-gtk/configure.ac
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-omap2_git.bb
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
Diffs:
#
# mt diff -ra147eede058360494dc7116dfa7a3de17b92123b -r44216bd9876fdfa1f84526d6aa26261db29e7710
#
#
#
# add_dir "packages/webkit/webkit-gtk"
#
# add_file "packages/webkit/webkit-gtk/GNUmakefile.am"
# content [3fa55447d194f071e732102b5c13bc3d1d73e8ea]
#
# add_file "packages/webkit/webkit-gtk/Makefile"
# content [45c43d087d496c1ad06572aa5f3a45d0d522bf49]
#
# add_file "packages/webkit/webkit-gtk/Makefile.shared"
# content [425c017b0f4d7e55a36af684ed738656aafeeead]
#
# add_file "packages/webkit/webkit-gtk/WebKit.pri"
# content [fd870b3307fb95ac907a4095ab79658dd7879277]
#
# add_file "packages/webkit/webkit-gtk/WebKit.pro"
# content [1e5c7f9961944af590055c84c58d1acabab3632b]
#
# add_file "packages/webkit/webkit-gtk/autogen.sh"
# content [aa58f66750dc6ee25269a29dd5ba9558fbb3ef9d]
#
# add_file "packages/webkit/webkit-gtk/configure.ac"
# content [026e427444b23ac308a2c3f79cd91a90efe7b2b3]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [8652978a044df3b651585f9a18c684f81e52849f]
# to [76eb7bae7361467379802b9566a246c1bcf3364c]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [d2df9d873b73d322c1d6a7918ef9c8786b091e48]
# to [95a249820dd271ec320b8852a3e94624874ade1e]
#
============================================================
--- packages/webkit/webkit-gtk/GNUmakefile.am 3fa55447d194f071e732102b5c13bc3d1d73e8ea
+++ packages/webkit/webkit-gtk/GNUmakefile.am 3fa55447d194f071e732102b5c13bc3d1d73e8ea
@@ -0,0 +1,394 @@
+# Top-level Makefile rule for automake
+#
+# Variable conventions:
+#
+# _h_api = API headers that will be installed and included in the distribution
+# _cppflags = flags that will be passed to the C/CXX Preprocessor
+# _sources = sources that will be compiled and included in the distribution
+# _headers = header files that will be part of the distribution
+# _built_sources = files that will be autogenerated by the build system and
+# will be part of the _SOURCES primary
+# _built_nosources = files that are autogenerated but are not part of the
+# _SOURCES primary
+# _cleanfiles = files that will be removed by the clean target
+#
+# Sources, headers, flags, etc... should be added to the respective variables
+# with the above suffix, e.g, webcore-specific sources should go to
+# webcore_sources, gtk port-specific flags should go to webkitgtk_cppflags,
+# etc... The only exceptions are the global variables. See Global Variables below.
+#
+# Global Variables
+#
+# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any
+# specific port
+# global_cflags = CFLAGS that apply to JSC, WebCore, and to
+# any specific port
+# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any
+# specific port
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+# Directory for autogenerated sources
+GENSOURCES := $(top_builddir)/DerivedSources
+GENPROGRAMS := $(top_builddir)/Programs
+
+# Script for creating hash tables
+CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table
+
+# Libraries and support components
+noinst_PROGRAMS :=
+
+lib_LIBRARIES :=
+
+IDL_BINDINGS :=
+
+# Files that will be distributed
+EXTRA_DIST :=
+
+# Global flags to CPP
+global_cppflags :=
+
+global_cppflags += \
+ -DWTF_USE_ICU_UNICODE=1
+
+# Default compiler flags
+global_cflags := \
+ -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
+ -Wformat -Wformat-security -Wno-format-y2k -Wundef \
+ -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
+ -Wno-unused-parameter -Wno-parentheses
+
+global_cxxflags := \
+ $(SYMBOL_VISIBILITY_INLINES)
+
+if !ENABLE_DEBUG
+global_cflags += \
+ -fno-exceptions \
+ $(SYMBOL_VISIBILITY)
+
+global_cxxflags += \
+ -fno-rtti
+endif
+
+# Shared libraries
+lib_LTLIBRARIES = \
+ libwebkit-1.0.la
+
+# Convenience libraries
+noinst_LTLIBRARIES = \
+ libJavaScriptCore.la \
+ libWebCore.la
+
+#
+# JavaScriptCore
+javascriptcore_h_api :=
+javascriptcore_cppflags:=
+javascriptcore_sources :=
+javascriptcore_built_sources :=
+javascriptcore_built_nosources :=
+
+javascriptcore_cppflags += \
+ -I$(srcdir)/JavaScriptCore \
+ -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
+ -I$(srcdir)/JavaScriptCore/wtf \
+ -I$(srcdir)/JavaScriptCore/kjs \
+ -I$(top_builddir)/DerivedSources
+
+# The variables above are already included below so no need to touch
+# these variables unless you really have to
+nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
+ $(javascriptcore_built_nosources)
+
+nodist_libJavaScriptCore_la_SOURCES = \
+ $(javascriptcore_built_sources)
+
+libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
+libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
+
+libJavaScriptCore_la_SOURCES = \
+ $(javascriptcore_sources)
+
+libJavaScriptCore_la_LIBADD = \
+ $(UNICODE_LIBS) \
+ $(GLOBALDEPS_LIBS) \
+ -lpthread
+
+libJavaScriptCore_la_CXXFLAGS = \
+ $(global_cxxflags) \
+ $(global_cflags) \
+ $(GLOBALDEPS_CFLAGS) \
+ $(UNICODE_CFLAGS) \
+ -fno-strict-aliasing
+
+libJavaScriptCore_la_CFLAGS = \
+ $(global_cflags) \
+ $(GLOBALDEPS_CFLAGS) \
+ $(UNICODE_CFLAGS) \
+ -fno-strict-aliasing
+
+libJavaScriptCore_la_CPPFLAGS = \
+ $(global_cppflags) \
+ $(javascriptcore_cppflags)
+
+#
+# WebCore
+webcore_cppflags :=
+webcore_sources :=
+webcore_headers :=
+webcore_libadd :=
+webcore_built_sources :=
+webcore_built_nosources :=
+
+nodist_libWebCore_la_SOURCES = \
+ $(webcore_built_sources)
+
+libWebCore_la_SOURCES = \
+ $(webcore_headers) \
+ $(webcore_sources)
+
+libWebCore_la_CXXFLAGS = \
+ -fno-strict-aliasing \
+ $(global_cxxflags) \
+ $(global_cflags) \
+ $(GLOBALDEPS_CFLAGS) \
+ $(UNICODE_CFLAGS) \
+ $(WEBKITDEPS_CFLAGS) \
+ $(LIBCURL_CFLAGS) \
+ $(LIBSOUP_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(GSTREAMER_CFLAGS) \
+ $(LIBXSLT_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(HILDON_CFLAGS)
+
+libWebCore_la_CFLAGS = \
+ -fno-strict-aliasing \
+ $(global_cflags) \
+ $(GLOBALDEPS_CFLAGS) \
+ $(UNICODE_CFLAGS) \
+ $(WEBKITDEPS_CFLAGS) \
+ $(LIBCURL_CFLAGS) \
+ $(LIBSOUP_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(GSTREAMER_CFLAGS) \
+ $(LIBXSLT_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(HILDON_CFLAGS)
+
+libWebCore_la_CPPFLAGS = \
+ $(global_cppflags) \
+ $(webcore_cppflags) \
+ $(javascriptcore_cppflags) \
+ $(webkitgtk_cppflags) \
+ $(HILDON_CPPFLAGS)
+
+libWebCore_la_LIBADD = \
+ libJavaScriptCore.la \
+ $(webcore_libadd) \
+ $(GLOBALDEPS_LIBS) \
+ $(WEBKITDEPS_LIBS) \
+ $(LIBCURL_LIBS) \
+ $(LIBSOUP_LIBS) \
+ $(UNICODE_LIBS) \
+ $(SQLITE3_LIBS) \
+ $(GSTREAMER_LIBS) \
+ $(LIBXSLT_LIBS) \
+ $(HILDON_LIBS) \
+ -lpthread \
+ -ljpeg
+
+# WebKit
+webkitgtk_h_api :=
+webkitgtk_headers :=
+webkitgtk_sources :=
+webkitgtk_cppflags :=
+webkitgtk_built_sources :=
+webkitgtk_built_nosources :=
+webkitgtk_cleanfiles :=
+
+nodist_libwebkit_1_0_la_SOURCES = \
+ $(webkitgtk_built_sources)
+
+libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
+libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api)
+
+libwebkit_1_0_la_SOURCES = \
+ $(webkitgtk_headers) \
+ $(webkitgtk_sources)
+
+libwebkit_1_0_la_CXXFLAGS = \
+ $(libWebCore_la_CXXFLAGS)
+
+libwebkit_1_0_la_CFLAGS = \
+ $(libWebCore_la_CFLAGS)
+
+libwebkit_1_0_la_CPPFLAGS = \
+ $(libWebCore_la_CPPFLAGS)
+
+libwebkit_1_0_la_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ -version-info @LIBWEBKITGTK_VERSION@
+
+libwebkit_1_0_la_LIBADD = \
+ libWebCore.la
+
+#
+# Extra checks and flags
+global_cppflags += \
+ -DBUILDING_GTK__=1 \
+ -DWTF_CHANGES
+
+if !ENABLE_FAST_MALLOC
+global_cppflags += \
+ -DUSE_SYSTEM_MALLOC
+endif
+
+if TARGET_X11
+global_cppflags += -DXP_UNIX
+webcore_libadd += -lXt
+endif
+
+if !ENABLE_DEBUG
+global_cppflags += -DNDEBUG
+else
+webkitgtk_cppflags += \
+ -DG_DISABLE_DEPRECATED \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
+ -DPANGO_DISABLE_DEPRECATED
+
+# Might be useful in the future
+# -DGDK_MULTIHEAD_SAFE \
+# -DGTK_MULTIHEAD_SAFE
+endif
+
+if !ENABLE_DATABASE
+global_cppflags += -DENABLE_DATABASE=0
+endif
+
+if !ENABLE_ICONDATABASE
+global_cppflags += -DENABLE_ICONDATABASE=0
+endif
+
+if ENABLE_COVERAGE
+global_cppflags += \
+ -DGCC_GENERATE_TEST_COVERAGE_FILES \
+ -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
+endif
+
+if ENABLE_VIDEO
+webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
+endif
+
+webkitgtk_cppflags += \
+-I$(top_builddir)/WebKit/gtk/webkit \
+-DBUILDING_CAIRO__=1 \
+-DBUILD_WEBKIT
+
+webkitgtk_h_api += \
+ WebKit/gtk/webkit/webkit.h \
+ WebKit/gtk/webkit/webkitdefines.h \
+ WebKit/gtk/webkit/webkitnetworkrequest.h \
+ WebKit/gtk/webkit/webkitwebbackforwardlist.h \
+ WebKit/gtk/webkit/webkitwebframe.h \
+ WebKit/gtk/webkit/webkitwebhistoryitem.h \
+ WebKit/gtk/webkit/webkitwebsettings.h \
+ WebKit/gtk/webkit/webkitwebview.h
+
+webkitgtk_built_sources += \
+ DerivedSources/webkit-marshal.h \
+ DerivedSources/webkit-marshal.cpp
+
+webkitgtk_headers += \
+ WebKit/gtk/webkit/webkitprivate.h \
+ WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
+ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
+ WebKit/gtk/WebCoreSupport/DragClientGtk.h \
+ WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
+ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
+ WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
+ WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
+
+webkitgtk_sources += \
+ WebKit/gtk/webkit/webkitnetworkrequest.cpp \
+ WebKit/gtk/webkit/webkitprivate.cpp \
+ WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
+ WebKit/gtk/webkit/webkitwebframe.cpp \
+ WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
+ WebKit/gtk/webkit/webkitwebsettings.cpp \
+ WebKit/gtk/webkit/webkitwebview.cpp \
+ WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
+ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
+ WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
+ WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
+ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
+ WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
+ WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
+
+webkitgtk_cleanfiles += \
+ $(top_builddir)/Programs/GtkLauncher \
+ $(top_builddir)/WebKit/gtk/webkit-1.0.pc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
+
+WEBKIT_MARSHAL = $(GENSOURCES)/webkit-marshal
+WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
+
+stamp_files := \
+ stamp-webkit-marshal.cpp \
+ stamp-webkit-marshal.h
+
+DerivedSources/webkit-marshal.cpp: stamp-webkit-marshal.cpp
+ @true
+
+DerivedSources/webkit-marshal.h: stamp-webkit-marshal.h
+ @true
+
+stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
+ echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
+ $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
+ echo timestamp > $(@F)
+
+stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST)
+ $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
+ echo timestamp > $(@F)
+
+# END WEBKIT GTK+
+
+# Files that will be cleaned
+MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+
+# Include module makefiles
+include JavaScriptCore/GNUmakefile.am
+include WebCore/GNUmakefile.am
+include WebKitTools/GNUmakefile.am
+
+# Autogenerated sources
+BUILT_SOURCES = \
+ $(javascriptcore_built_sources) \
+ $(javascriptcore_built_nosources) \
+ $(webcore_built_sources) \
+ $(webcore_built_nosources) \
+ $(webkitgtk_built_sources) \
+ $(webkitgtk_built_nosources)
+
+# Project-wide clean rules
+CLEANFILES += \
+ $(webkitgtk_cleanfiles)
+
+MAINTAINERCLEANFILES += \
+ $(srcdir)/aconfig.h.in \
+ configure \
+ config.* \
+ GNUmakefile.in \
+ INSTALL \
+ README
+
+# remove built sources and program directories
+clean-local:
+ -rm -rf $(GENSOURCES) $(GENPROGRAMS)
============================================================
--- packages/webkit/webkit-gtk/Makefile 45c43d087d496c1ad06572aa5f3a45d0d522bf49
+++ packages/webkit/webkit-gtk/Makefile 45c43d087d496c1ad06572aa5f3a45d0d522bf49
@@ -0,0 +1,29 @@
+MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
+
+all:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+debug d development dev develop:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+release r deployment dep deploy:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+universal u:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+64:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+64u:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+clean:
+ @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
============================================================
--- packages/webkit/webkit-gtk/Makefile.shared 425c017b0f4d7e55a36af684ed738656aafeeead
+++ packages/webkit/webkit-gtk/Makefile.shared 425c017b0f4d7e55a36af684ed738656aafeeead
@@ -0,0 +1,30 @@
+SCRIPTS_PATH ?= ../WebKitTools/Scripts
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
+
+all:
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+debug d development dev develop: force
+ $(SCRIPTS_PATH)/set-webkit-configuration --debug
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+release r deployment dep deploy: force
+ $(SCRIPTS_PATH)/set-webkit-configuration --release
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+universal u: force
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+x86_64: force
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+64: force
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+64u: force
+ ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+clean:
+ ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+force: ;
============================================================
--- packages/webkit/webkit-gtk/WebKit.pri fd870b3307fb95ac907a4095ab79658dd7879277
+++ packages/webkit/webkit-gtk/WebKit.pri fd870b3307fb95ac907a4095ab79658dd7879277
@@ -0,0 +1,107 @@
+# Include file to make it easy to include WebKit into Qt projects
+
+
+isEmpty(OUTPUT_DIR) {
+ CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
+ CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+}
+
+!gtk-port:CONFIG += qt-port
+qt-port:DEFINES += BUILDING_QT__=1
+qt-port:!building-libs {
+ QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+ LIBS += -lQtWebKit
+ DEPENDPATH += $$PWD/WebKit/qt/Api
+}
+
+gtk-port:!building-libs {
+ QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+ LIBS += -lWebKitGtk
+ DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit
+}
+
+gtk-port {
+ CONFIG += link_pkgconfig
+
+ DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1
+
+ # We use FreeType directly with Cairo
+ PKGCONFIG += cairo-ft
+
+ directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0
+ else: PKGCONFIG += cairo gtk+-2.0
+
+ # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb)
+ CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG)
+
+ # We use the curl http backend on all platforms
+ PKGCONFIG += libcurl
+ DEFINES += WTF_USE_CURL=1
+
+ LIBS += -lWebKitGtk -ljpeg -lpng
+
+ QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+ QMAKE_LIBS += $$system(icu-config --ldflags)
+
+ # This set of warnings is borrowed from the Mac build
+ QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd7e8ac4147edec9f5d58ed1abdde271e7d4c7b29 -r44216bd9876fdfa1f84526d6aa26261db29e7710
#
#
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [dd2138b465f663603f99ce6be674dfd46af8c33f]
# to [252a01909d484f213676e0ef32e9f21efbd1f999]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [d3e88061dc045abd484e366a596f3accf7445889]
# to [14c6b4a552e2c80acee490345dee361941a819ac]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [a902b60d693bd9d292860e99c2423a71397b7318]
# to [561fbe60af1e4718fb9ecf5d28222df8410898dd]
#
# patch "conf/distro/include/angstrom-uclibc.inc"
# from [ed3615a8cce5b329c1b4354ca91a98190a64f862]
# to [ca2fe974b58e8678de2abda68a7ace8c061523a2]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [aa5b5d5f2b35e5caadd9d80cc912891617afe639]
# to [76eb7bae7361467379802b9566a246c1bcf3364c]
#
============================================================
--- conf/distro/angstrom-2008.1.conf dd2138b465f663603f99ce6be674dfd46af8c33f
+++ conf/distro/angstrom-2008.1.conf 252a01909d484f213676e0ef32e9f21efbd1f999
@@ -70,13 +70,10 @@ PREFERRED_VERSION_linux-libc-headers =
PREFERRED_VERSION_linux-libc-headers = "2.6.23"
#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc = "2.6.1"
-PREFERRED_VERSION_glibc-intermediate = "2.6.1"
-PREFERRED_VERSION_glibc-initial = "2.6.1"
-PREFERRED_VERSION_uclibc ?= "0.9.29"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
+PREFERRED_VERSION_glibc ?= "2.6.1"
+PREFERRED_VERSION_glibc-intermediate ?= "2.6.1"
+PREFERRED_VERSION_glibc-initial ?= "2.6.1"
-
#Prefer a newer GTK+ and friends
PREFERRED_VERSION_gtk+ ?= "2.12.3"
PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
@@ -134,18 +131,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREF
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
-#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
-
# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc d3e88061dc045abd484e366a596f3accf7445889
+++ conf/distro/include/angstrom-2008-preferred-versions.inc 14c6b4a552e2c80acee490345dee361941a819ac
@@ -1,5 +1,5 @@ PREFERRED_VERSION_busybox = "1.9.2"
PREFERRED_VERSION_busybox = "1.9.2"
-PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus = "1.2.1"
PREFERRED_VERSION_glib-2.0 = "2.16.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.10"
@@ -7,3 +7,4 @@ PREFERRED_VERSION_xserver-kdrive = "1.4.
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_dropbear = "0.50"
============================================================
--- conf/distro/include/angstrom-glibc.inc a902b60d693bd9d292860e99c2423a71397b7318
+++ conf/distro/include/angstrom-glibc.inc 561fbe60af1e4718fb9ecf5d28222df8410898dd
@@ -5,6 +5,16 @@ PREFERRED_PROVIDER_linux-libc-headers ?=
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
+#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+
+
TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
#mess with compiler flags to use -Os instead of -O2
============================================================
--- conf/distro/include/angstrom-uclibc.inc ed3615a8cce5b329c1b4354ca91a98190a64f862
+++ conf/distro/include/angstrom-uclibc.inc ca2fe974b58e8678de2abda68a7ace8c061523a2
@@ -3,7 +3,13 @@ PREFERRED_PROVIDER_virtual/libintl ?= "g
PREFERRED_PROVIDER_virtual/libc = "uclibc"
PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+
USE_NLS ?= "no"
USE_NLS_glib-2.0 = "yes"
============================================================
--- conf/distro/include/sane-srcrevs.inc aa5b5d5f2b35e5caadd9d80cc912891617afe639
+++ conf/distro/include/sane-srcrevs.inc 76eb7bae7361467379802b9566a246c1bcf3364c
@@ -14,6 +14,8 @@ SRCREV_pn-bfin-uclibc ?= "1857"
SRCREV_pn-aircrack-ng ?= "802"
SRCREV_pn-assassin ?= "41"
SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-uclibc ?= "21926"
+SRCREV_pn-uclibc-initial ?= "21926"
SRCREV_pn-contact ?= "1410"
SRCREV_pn-dbus-c++-native ?= "13131"
SRCREV_pn-dbus-c++ ?= "13131"
More information about the Openembedded-commits
mailing list