[CONSOLIDATED PULL 00/16] Various Updates and Fixes

[CONSOLIDATED PULL 00/16] Various Updates and Fixes

[Saul Wold]

Richard,

This request has the patches to correctly build subversion-native,
I tested this and ensured we do not have a circular dependency issue.

I am not sure about the FILESDIR addition in the libx11-diet patch, so I 
would like you review of that one.

Thanks
	Sau!


The following changes since commit da8425174529f10e16cde21fbea7f804284c38ae:

  alsa-lib: add nativesdk BBCLASSEXTEND (2011-11-15 12:22:58 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/stage
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Dmitry Eremin-Solenikov (2):
  screenshot: rename to sato-screenshot
  gobject-introspection: update frome meta-oe

Martin Jansa (3):
  base.bbclass: add subversion-native to DEPENDS if there is svn:// in
    SRC_URI
  default-providers: add alsa to resolve multiple runtime providers
  apr-util: extend sed call to fix libtool patch for case without SHELL
    in LIBTOOL variable

Michael Brown (1):
  gcc-4.6: fix toolchain build for SH4

Saul Wold (8):
  libgcrypt: add BBCLASSEXTEND native for gnutls-native
  libgpg-error: add BBCLASSEXTEND native for libgcrypts and
    gnutls-native
  file: update to 5.09
  gnu-config: update to git HEAD
  gnu-config: Create 2011111 release
  bitbake.conf: Update ASSUME_PROVIDED
  boost: Update to 1.47.0 & Cleanup
  distro_tracking: Refect Recipe Updates & Status

Xiaofeng Yan (2):
  libx11-diet: update to 1.4.4
  directfb: update to 1.4.15

 meta/classes/base.bbclass                          |    8 +-
 meta/conf/bitbake.conf                             |    5 -
 meta/conf/distro/include/default-providers.inc     |    1 +
 .../conf/distro/include/distro_tracking_fields.inc |   50 ++--
 .../file/file/fix_version_check.patch              |   21 ++
 .../file/{file_5.04.bb => file_5.09.bb}            |    9 +-
 meta/recipes-devtools/gcc/gcc-cross4.inc           |    2 +
 .../gnu-config/config-guess-uclibc.patch           |  145 +++++------
 .../gnu-config/gnu-config_20111111.bb              |   41 +++
 .../{gnu-config_20080123.bb => gnu-config_git.bb}  |   15 +-
 .../gnome/gobject-introspection/configure.patch    |   27 --
 .../gnome/gobject-introspection/pathfix.patch      |   27 --
 .../use-usr-bin-env-for-python.patch               |   20 ++
 .../gnome/gobject-introspection_git.bb             |   32 ++-
 .../{directfb_1.4.12.bb => directfb_1.4.15.bb}     |    9 +-
 .../directfb-1.2.x-fix-pkgconfig-cflags.patch      |   36 ++--
 .../xorg-lib/libx11-diet-1.3/include_fix.patch     |   25 --
 .../xorg-lib/libx11-diet-1.3/nodolt.patch          |   14 -
 .../X18NCMSstubs.diff                              |    1 +
 .../fix-disable-xlocale.diff                       |    1 +
 .../fix-utf8-wrong-define.patch                    |    2 +
 .../libx11-diet-1.4.4/keysymdef_include.patch      |   23 ++
 .../x11_disable_makekeys.patch                     |   23 +-
 .../{libx11-diet_1.3.bb => libx11-diet_1.4.4.bb}   |   17 +-
 .../files/fix_ldadd_order.patch                    |    0
 .../sato-screenshot_git.bb}                        |    2 +-
 meta/recipes-sato/tasks/task-core-x11.bb           |    2 +-
 meta/recipes-support/apr/apr-util_1.3.12.bb        |    2 +
 meta/recipes-support/boost/boost-jam-native.inc    |   32 ---
 .../boost/boost-jam-native_3.1.18.bb               |    8 -
 .../boost/{boost-36.inc => boost.inc}              |   42 +++-
 .../boost/{boost_1.44.0.bb => boost_1.47.0.bb}     |   13 +-
 .../recipes-support/boost/files/1.34.1-gcc43.patch |  226 -----------------
 .../boost/files/atomic_count_gcc_atomicity.patch   |   15 --
 meta/recipes-support/boost/files/gcc41.patch       |   16 --
 meta/recipes-support/boost/files/gcc43.patch       |  258 --------------------
 .../recipes-support/boost/files/linux-uclibc.patch |   12 -
 .../boost/files/unit_test_log10f.patch             |   22 --
 meta/recipes-support/libgcrypt/libgcrypt.inc       |    2 +
 .../libgpg-error/libgpg-error_1.10.bb              |    2 +
 40 files changed, 339 insertions(+), 869 deletions(-)
 create mode 100644 meta/recipes-devtools/file/file/fix_version_check.patch
 rename meta/recipes-devtools/file/{file_5.04.bb => file_5.09.bb} (79%)
 create mode 100644 meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
 rename meta/recipes-devtools/gnu-config/{gnu-config_20080123.bb => gnu-config_git.bb} (73%)
 delete mode 100644 meta/recipes-gnome/gnome/gobject-introspection/configure.patch
 delete mode 100644 meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
 create mode 100644 meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
 rename meta/recipes-graphics/directfb/{directfb_1.4.12.bb => directfb_1.4.15.bb} (63%)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
 rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/X18NCMSstubs.diff (99%)
 rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%)
 rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
 rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/x11_disable_makekeys.patch (43%)
 rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.3.bb => libx11-diet_1.4.4.bb} (49%)
 rename meta/recipes-sato/{screenshot => sato-screenshot}/files/fix_ldadd_order.patch (100%)
 rename meta/recipes-sato/{screenshot/screenshot_git.bb => sato-screenshot/sato-screenshot_git.bb} (92%)
 delete mode 100644 meta/recipes-support/boost/boost-jam-native.inc
 delete mode 100644 meta/recipes-support/boost/boost-jam-native_3.1.18.bb
 rename meta/recipes-support/boost/{boost-36.inc => boost.inc} (88%)
 rename meta/recipes-support/boost/{boost_1.44.0.bb => boost_1.47.0.bb} (66%)
 delete mode 100644 meta/recipes-support/boost/files/1.34.1-gcc43.patch
 delete mode 100644 meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
 delete mode 100644 meta/recipes-support/boost/files/gcc41.patch
 delete mode 100644 meta/recipes-support/boost/files/gcc43.patch
 delete mode 100644 meta/recipes-support/boost/files/linux-uclibc.patch
 delete mode 100644 meta/recipes-support/boost/files/unit_test_log10f.patch

-- 
1.7.6.4

[CONSOLIDATED PULL 01/16] base.bbclass: add subversion-native to DEPENDS if there is svn:// in SRC_URI

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* in some cases this could cause circual dependency (ie if we decide to
  apr_svn.bb or something like that before subversion-native in dependency
  tree), Saul said he had such case, but I wasn't able to reproduce it
  here (here it builds subversion-native-1.7.0 fine).

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/base.bbclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f3f798f..ba1f230 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -401,8 +401,14 @@ python () {
                     bb.note("SKIPPING %s because it's %s" % (pn, this_license))
                     raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
 
-    # Git packages should DEPEND on git-native
     srcuri = d.getVar('SRC_URI', 1)
+    # Svn packages should DEPEND on subversion-native
+    if "svn://" in srcuri:
+        depends = d.getVarFlag('do_fetch', 'depends') or ""
+        depends = depends + " subversion-native:do_populate_sysroot"
+        d.setVarFlag('do_fetch', 'depends', depends)
+
+    # Git packages should DEPEND on git-native
     if "git://" in srcuri:
         depends = d.getVarFlag('do_fetch', 'depends') or ""
         depends = depends + " git-native:do_populate_sysroot"
-- 
1.7.6.4

[CONSOLIDATED PULL 02/16] default-providers: add alsa to resolve multiple runtime providers

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/conf/distro/include/default-providers.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index afea5e7..79785fb 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -19,6 +19,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
 #
 # Default recipe providers
 #
+PREFERRED_PROVIDER_alsa-lib ?= "alsa-lib"
 PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
 PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
 PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
-- 
1.7.6.4

[CONSOLIDATED PULL 03/16] apr-util: extend sed call to fix libtool patch for case without SHELL in LIBTOOL variable

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-support/apr/apr-util_1.3.12.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-support/apr/apr-util_1.3.12.bb b/meta/recipes-support/apr/apr-util_1.3.12.bb
index 0064c51..62d72cf 100644
--- a/meta/recipes-support/apr/apr-util_1.3.12.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.12.bb
@@ -40,6 +40,8 @@ do_configure_prepend_virtclass-native() {
 }
 do_configure_append_virtclass-native() {
 	sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
+	# sometimes there isn't SHELL
+	sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
 }
 
 FILES_${PN}     += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
-- 
1.7.6.4

[CONSOLIDATED PULL 04/16] libx11-diet: update to 1.4.4

[Saul Wold]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

I remove patch "nodolt.patch" because it is no use in the new version \
and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4.

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 .../xorg-lib/libx11-diet-1.3/include_fix.patch     |   25 --------------------
 .../xorg-lib/libx11-diet-1.3/nodolt.patch          |   14 -----------
 .../X18NCMSstubs.diff                              |    1 +
 .../fix-disable-xlocale.diff                       |    1 +
 .../fix-utf8-wrong-define.patch                    |    2 +
 .../libx11-diet-1.4.4/keysymdef_include.patch      |   23 ++++++++++++++++++
 .../x11_disable_makekeys.patch                     |   23 ++++++++++--------
 .../{libx11-diet_1.3.bb => libx11-diet_1.4.4.bb}   |   17 ++++++++-----
 8 files changed, 50 insertions(+), 56 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
 rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/X18NCMSstubs.diff (99%)
 rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%)
 rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%)
 create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
 rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 => libx11-diet-1.4.4}/x11_disable_makekeys.patch (43%)
 rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.3.bb => libx11-diet_1.4.4.bb} (49%)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
deleted file mode 100644
index b3bcbab..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- configure.ac |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- libX11-1.1.5.orig/configure.ac
-+++ libX11-1.1.5/configure.ac
-@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
- AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
- 
- #
- # Find keysymdef.h
- #
--AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+	AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ 	KEYSYMDEF=$withval, KEYSYMDEF="")
- if test -f "$KEYSYMDEF"; then
-         AC_MSG_RESULT([$KEYSYMDEF])
- else
- 	AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
deleted file mode 100644
index cc05fdc..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libX11-1.2.1/configure.ac
-===================================================================
---- libX11-1.2.1.orig/configure.ac	2009-07-02 14:07:54.000000000 +0100
-+++ libX11-1.2.1/configure.ac	2009-07-02 14:08:01.000000000 +0100
-@@ -20,7 +20,6 @@
- 
- # Checks for programs.
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_CC
- XORG_CWARNFLAGS
- 
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
similarity index 99%
rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
index 91ab180..be71d44 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
@@ -1,5 +1,6 @@
 Upstream-Status: Pending
 
+Upstream-Status: Inappropriate [configuration]
 Index: libX11-1.3/src/imConv.c
 ===================================================================
 --- libX11-1.3.orig/src/imConv.c
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
similarity index 90%
rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
index 7dcdd6a..a7c3984 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
@@ -1,5 +1,6 @@
 Upstream-Status: Pending
 
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
 --- libX11-X11R7.0-1.0.0/src/Font.c.orig	2006-03-12 18:35:42.000000000 +0100
 +++ libX11-X11R7.0-1.0.0/src/Font.c	2006-03-12 18:40:27.000000000 +0100
 @@ -701,7 +701,11 @@
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
similarity index 88%
rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
index 26d3349..c6347f5 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
@@ -1,5 +1,7 @@
 Upstream-Status: Pending
 
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
+
 #
 # Patch managed by http://www.holgerschurig.de/patcher.html
 #
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
new file mode 100644
index 0000000..d1bdab9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
+diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
+--- libX11-1.3.6.orig//configure.ac	2010-09-20 08:04:16.000000000 +0200
++++ libX11-1.3.6/configure.ac	2010-09-28 16:29:26.000000000 +0200
+@@ -355,7 +355,14 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysym definitions])
+-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++AC_ARG_WITH(keysymdefdir,
++        AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
++        KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
++
++if test x$KEYSYMDEFDIR = x; then
++	KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++fi
++
+ FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+ for i in $FILES; do
+     if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
similarity index 43%
rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
index 0445835..ab48193 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
@@ -1,24 +1,27 @@
 Upstream-Status: Inappropriate [configuration]
 
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
 ---
- src/util/Makefile.am |   17 -----------------
- 1 file changed, 17 deletions(-)
+ src/util/Makefile.am |   21 -----------------
+ 1 file changed, 21 deletions(-)
 
-Index: libX11-1.2.1/src/util/Makefile.am
-===================================================================
---- libX11-1.2.1.orig/src/util/Makefile.am	2008-10-07 18:18:19.000000000 +0100
-+++ libX11-1.2.1/src/util/Makefile.am	2009-07-02 14:04:38.000000000 +0100
-@@ -1,20 +1,3 @@
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
+--- a/src/util/Makefile.am
++++ b/src/util/Makefile.am
+@@ -1,24 +1,3 @@
  
 -noinst_PROGRAMS=makekeys
 -
--makekeys_CFLAGS=$(X11_CFLAGS)
+-makekeys_CFLAGS = \
+-	$(X11_CFLAGS) \
+-	$(CWARNFLAGS)
 -
 -CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@
 -
  EXTRA_DIST = mkks.sh
--
+ 
 -if LINT
 -# Check source code with tools like lint & sparse
 -
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
similarity index 49%
rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
index de7edf1..1762829 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
@@ -3,23 +3,26 @@ require libx11.inc
 DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
 this version."
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=597df7e9217e89ccaeb749f48ce2aeb0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
-PR = "r4"
+PR = "r0"
 
 SRC_URI += "file://x11_disable_makekeys.patch \
-            file://include_fix.patch \
             file://X18NCMSstubs.diff \
+            file://keysymdef_include.patch \
             file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch \
-            file://nodolt.patch"
+           "
 
-SRC_URI[md5sum] = "0545089013213e90aac19b8f8045d32e"
-SRC_URI[sha256sum] = "34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac"
+
+SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
+SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
 
 DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
 
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
 CFLAGS += "-D_GNU_SOURCE"
+
-- 
1.7.6.4

[CONSOLIDATED PULL 05/16] directfb: update to 1.4.15

[Saul Wold]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

The newest version for directfb is 1.5.3 but it's instruction set base on armv6.
The current qemuarm don't have some instructions for armv6 because some codes of \
the new version of directfb more than 1.5 are realized with assemble language,for example the lock. \
I update this recipe to 1.4.15 for directfb running more platform.

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 .../{directfb_1.4.12.bb => directfb_1.4.15.bb}     |    9 ++++-
 .../directfb-1.2.x-fix-pkgconfig-cflags.patch      |   36 +++++++++----------
 2 files changed, 24 insertions(+), 21 deletions(-)
 rename meta/recipes-graphics/directfb/{directfb_1.4.12.bb => directfb_1.4.15.bb} (63%)

diff --git a/meta/recipes-graphics/directfb/directfb_1.4.12.bb b/meta/recipes-graphics/directfb/directfb_1.4.15.bb
similarity index 63%
rename from meta/recipes-graphics/directfb/directfb_1.4.12.bb
rename to meta/recipes-graphics/directfb/directfb_1.4.15.bb
index 4e8203b..71c0876 100644
--- a/meta/recipes-graphics/directfb/directfb_1.4.12.bb
+++ b/meta/recipes-graphics/directfb/directfb_1.4.15.bb
@@ -1,10 +1,15 @@
 require directfb.inc
 
-RV = "1.4-5"
+RV = "1.4-6"
 PR = "r0"
 
 DEPENDS += "sysfsutils"
 
+SRC_URI = " \
+    http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \
+    file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
+    "
+
 EXTRA_OECONF = "\
   --enable-freetype=yes \
   --enable-zlib \
@@ -14,7 +19,7 @@ EXTRA_OECONF = "\
   --disable-x11 \
 "
 
-LEAD_SONAME = "libdirectfb-1.4.so.5"
+LEAD_SONAME = "libdirectfb-1.4.so.6"
 
 SRC_URI[md5sum] = "2c779c9a8456790c6c29ad85459b2600"
 SRC_URI[sha256sum] = "b119ab9c5c0c505c23e32d41ae54bd04cb474c5e58900ec0f1cf9482f892f9b2"
diff --git a/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch b/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
index 274ad50..ee60718 100644
--- a/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
+++ b/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
@@ -1,9 +1,11 @@
+directfb: Get this patch from Openembedded
+
 Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
 
-Index: DirectFB-1.4.11/directfb-internal.pc.in
-===================================================================
---- DirectFB-1.4.11.orig/directfb-internal.pc.in	2010-10-08 05:43:46.000000000 -0700
-+++ DirectFB-1.4.11/directfb-internal.pc.in	2011-04-06 13:48:23.120923997 -0700
+diff -Nur DirectFB-1.4.15/directfb-internal.pc.in DirectFB-1.4.15.new//directfb-internal.pc.in
+--- DirectFB-1.4.15/directfb-internal.pc.in	2011-09-29 17:51:21.000000000 +0800
++++ DirectFB-1.4.15.new//directfb-internal.pc.in	2011-11-03 15:14:37.000000000 +0800
 @@ -2,10 +2,10 @@
  exec_prefix=@exec_prefix@
  moduledir=@MODULEDIR@
@@ -17,31 +19,27 @@ Index: DirectFB-1.4.11/directfb-internal.pc.in
  Requires: directfb = @VERSION@
 -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@
 +Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}
-Index: DirectFB-1.4.11/directfb.pc.in
-===================================================================
---- DirectFB-1.4.11.orig/directfb.pc.in	2010-11-15 13:13:59.000000000 -0800
-+++ DirectFB-1.4.11/directfb.pc.in	2011-04-06 14:09:33.528923998 -0700
-@@ -9,4 +9,5 @@
+diff -Nur DirectFB-1.4.15/directfb.pc.in DirectFB-1.4.15.new//directfb.pc.in
+--- DirectFB-1.4.15/directfb.pc.in	2011-09-29 17:51:21.000000000 +0800
++++ DirectFB-1.4.15.new//directfb.pc.in	2011-11-03 15:15:55.000000000 +0800
+@@ -9,4 +9,4 @@
  Requires: @DEP_VOODOO@ fusion direct
  Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
- Libs.private: -L${libdir} @MEDIALIB@ @DYNLIB@ @ZLIB_LIBS@
+ Libs.private: -L${libdir} @LIBM@ @DYNLIB@ @ZLIB_LIBS@
 -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
 +Cflags: @THREADFLAGS@ -I${includedir}/directfb
-+
-Index: DirectFB-1.4.11/lib/fusion/fusion.pc.in
-===================================================================
---- DirectFB-1.4.11.orig/lib/fusion/fusion.pc.in	2010-10-08 05:43:46.000000000 -0700
-+++ DirectFB-1.4.11/lib/fusion/fusion.pc.in	2011-04-06 13:48:23.120923997 -0700
+diff -Nur DirectFB-1.4.15/lib/fusion/fusion.pc.in DirectFB-1.4.15.new//lib/fusion/fusion.pc.in
+--- DirectFB-1.4.15/lib/fusion/fusion.pc.in	2011-09-29 17:51:21.000000000 +0800
++++ DirectFB-1.4.15.new//lib/fusion/fusion.pc.in	2011-11-03 15:16:46.000000000 +0800
 @@ -8,4 +8,4 @@
  Version: @VERSION@
  Requires: direct
  Libs: -L${libdir} -lfusion
 -Cflags: -I@INCLUDEDIR@
 +Cflags: -I${includedir}/directfb -I${includedir}
-Index: DirectFB-1.4.11/lib/voodoo/voodoo.pc.in
-===================================================================
---- DirectFB-1.4.11.orig/lib/voodoo/voodoo.pc.in	2010-10-08 05:43:46.000000000 -0700
-+++ DirectFB-1.4.11/lib/voodoo/voodoo.pc.in	2011-04-06 13:48:23.120923997 -0700
+diff -Nur DirectFB-1.4.15/lib/voodoo/voodoo.pc.in DirectFB-1.4.15.new//lib/voodoo/voodoo.pc.in
+--- DirectFB-1.4.15/lib/voodoo/voodoo.pc.in	2011-09-29 17:51:21.000000000 +0800
++++ DirectFB-1.4.15.new//lib/voodoo/voodoo.pc.in	2011-11-03 15:17:34.000000000 +0800
 @@ -8,4 +8,4 @@
  Version: @VERSION@
  Requires: direct
-- 
1.7.6.4

[CONSOLIDATED PULL 06/16] libgcrypt: add BBCLASSEXTEND native for gnutls-native

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/libgcrypt/libgcrypt.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index 989d556..088cd34 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -28,3 +28,5 @@ ARM_INSTRUCTION_SET = "arm"
 # move libgcrypt-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig/*.pc"
+
+BBCLASSEXTEND = "native"
-- 
1.7.6.4

[CONSOLIDATED PULL 07/16] libgpg-error: add BBCLASSEXTEND native for libgcrypts and gnutls-native

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../libgpg-error/libgpg-error_1.10.bb              |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
index 0c10b47..95f9e56 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
@@ -28,3 +28,5 @@ do_install_append() {
 	# we don't have common lisp in OE
 	rm -rf "${D}${datadir}/common-lisp/"
 }
+
+BBCLASSEXTEND = "native"
-- 
1.7.6.4

[CONSOLIDATED PULL 08/16] file: update to 5.09

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../file/file/fix_version_check.patch              |   21 ++++++++++++++++++++
 .../file/{file_5.04.bb => file_5.09.bb}            |    9 +++----
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-devtools/file/file/fix_version_check.patch
 rename meta/recipes-devtools/file/{file_5.04.bb => file_5.09.bb} (79%)

diff --git a/meta/recipes-devtools/file/file/fix_version_check.patch b/meta/recipes-devtools/file/file/fix_version_check.patch
new file mode 100644
index 0000000..bd24ccb
--- /dev/null
+++ b/meta/recipes-devtools/file/file/fix_version_check.patch
@@ -0,0 +1,21 @@
+Since we are cross-compiling and need to have a cover script this
+version check sees "file.real-5.09" not "file-5.09", so fix the
+sed.
+
+Upstream-Status: Inapproriate [build-specific]
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: file-5.09/magic/Makefile.am
+===================================================================
+--- file-5.09.orig/magic/Makefile.am
++++ file-5.09/magic/Makefile.am
+@@ -260,7 +260,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_D
+ 	@(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
+ 	    echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
+ 	  else \
+-	    v=$$(file --version | sed -e s/file-// -e q); \
++	    v=$$(file --version | sed -e s/file.real-// -e q); \
+ 	    if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
+ 		echo "Cannot use the installed version of file ($$v) to"; \
+ 		echo "cross-compile file ${PACKAGE_VERSION}"; \
diff --git a/meta/recipes-devtools/file/file_5.04.bb b/meta/recipes-devtools/file/file_5.09.bb
similarity index 79%
rename from meta/recipes-devtools/file/file_5.04.bb
rename to meta/recipes-devtools/file/file_5.09.bb
index 1f9c78e..9b2f3a4 100644
--- a/meta/recipes-devtools/file/file_5.04.bb
+++ b/meta/recipes-devtools/file/file_5.09.bb
@@ -10,16 +10,15 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
 
 DEPENDS = "zlib file-native"
 DEPENDS_virtclass-native = "zlib-native"
-PR = "r2"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
-           file://stringb-compat.patch \
-           file://ge-le.patch \
+           file://fix_version_check.patch \
            file://dump \
            file://filesystems"
 
-SRC_URI[md5sum] = "accade81ff1cc774904b47c72c8aeea0"
-SRC_URI[sha256sum] = "4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c"
+SRC_URI[md5sum] = "6fd7cd6c4281e68fe9ec6644ce0fac6f"
+SRC_URI[sha256sum] = "bde1c9830ee6c234871778faae8277fdcf775fbb16dea63c8251e24b7c2f869c"
 
 inherit autotools
 
-- 
1.7.6.4

[CONSOLIDATED PULL 09/16] gnu-config: update to git HEAD

[Saul Wold]

Licence has update timestamp and Copyright year.
This change needs a coresponding change to ASSUME_PROVIDED
to add git-native

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../gnu-config/config-guess-uclibc.patch           |  145 +++++++++-----------
 .../{gnu-config_20080123.bb => gnu-config_git.bb}  |   15 +-
 2 files changed, 75 insertions(+), 85 deletions(-)
 rename meta/recipes-devtools/gnu-config/{gnu-config_20080123.bb => gnu-config_git.bb} (73%)

diff --git a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
index f862c83..dc15d91 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
+++ b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
@@ -4,12 +4,14 @@ Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-gu
 
 updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand)
 updated to 20080123 by Nitin A Kamble (by hand)
+updated to 20111001 by Saul Wold (by hand)
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
 
-Index: config/config.guess
+Index: git/config.guess
 ===================================================================
---- config.orig/config.guess
-+++ config/config.guess
-@@ -139,6 +139,19 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+--- git.orig/config.guess	2011-10-20 15:15:25.000000000 -0700
++++ git/config.guess	2011-10-20 16:56:43.810830229 -0700
+@@ -140,6 +140,19 @@
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
@@ -29,14 +31,26 @@ Index: config/config.guess
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -840,13 +853,13 @@ EOF
+@@ -871,15 +884,15 @@
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+ 	esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
  	    | grep -q __ARM_EABI__
  	then
 -	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	else
- 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ 		| grep -q __ARM_PCS_VFP
+@@ -891,19 +904,19 @@
  	fi
  	exit ;;
      avr32*:Linux:*:*)
@@ -44,13 +58,25 @@ Index: config/config.guess
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
-@@ -855,16 +868,16 @@ EOF
- 	echo crisv32-axis-linux-gnu
+-	echo cris-axis-linux-gnu
++	echo cris-axis-linux-${LIBC}
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-gnu
++	echo crisv32-axis-linux-${LIBC}
  	exit ;;
      frv:Linux:*:*)
--    	echo frv-unknown-linux-gnu
-+    	echo frv-unknown-linux-${LIBC}
+-	echo frv-unknown-linux-gnu
++	echo frv-unknown-linux-${LIBC}
+ 	exit ;;
+     hexagon:Linux:*:*)
+-	echo hexagon-unknown-linux-gnu
++	echo hexagon-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:Linux:*:*)
+ 	LIBC=gnu
+@@ -917,13 +930,13 @@
+ 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
  	exit ;;
      ia64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -64,21 +90,12 @@ Index: config/config.guess
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
-     mips:Linux:*:*)
+     mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -887,7 +900,7 @@ EOF
- 		s: ::g
- 		p
- 	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -910,16 +923,16 @@ EOF
- 		s: ::g
- 		p
- 	    }'`"
+@@ -942,54 +955,54 @@
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  	;;
@@ -86,24 +103,13 @@ Index: config/config.guess
 -	echo or32-unknown-linux-gnu
 +	echo or32-unknown-linux-${LIBC}
  	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo powerpc-unknown-linux-${LIBC}
- 	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-unknown-linux-${LIBC}
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-gnu
++	echo sparc-unknown-linux-${LIBC}
  	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -932,40 +945,40 @@ EOF
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++	echo hppa64-unknown-linux-${LIBC}
  	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
@@ -116,16 +122,20 @@ Index: config/config.guess
 +	  *)    echo hppa-unknown-linux-${LIBC} ;;
  	esac
  	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+	echo hppa64-unknown-linux-${LIBC}
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo ${UNAME_MACHINE}-ibm-linux
  	exit ;;
      sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      sh*:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -135,42 +145,21 @@ Index: config/config.guess
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
+     tile*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
      vax:Linux:*:*)
- 	echo ${UNAME_MACHINE}-dec-linux-gnu
+-	echo ${UNAME_MACHINE}-dec-linux-gnu
++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
  	exit ;;
      x86_64:Linux:*:*)
 -	echo x86_64-unknown-linux-gnu
 +	echo x86_64-unknown-linux-${LIBC}
  	exit ;;
      xtensa*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-@@ -980,20 +993,21 @@ EOF
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		;;
- 	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
- 		exit ;;
- 	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
- 		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
- 		exit ;;
- 	esac
-+	if [ $LIBC != "gnu" -o $LIBC != "gnulibc1" ];then echo "$TENTATIVE" && exit; fi
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
similarity index 73%
rename from meta/recipes-devtools/gnu-config/gnu-config_20080123.bb
rename to meta/recipes-devtools/gnu-config/gnu-config_git.bb
index f93d342..0fdee66 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -1,21 +1,22 @@
 SUMMARY = "gnu-configize"
 DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a directory tree"
 SECTION = "devel"
-LICENSE = "GPLv1+"
-LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=a089987af4a25cb0419d1c2fd6d495e3"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=0e6ca0501b27177f3bc640f7225e3ead"
 
 DEPENDS_virtclass-native = "perl-native-runtime"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-FIXEDSRCDATE = "${@d.getVar('FILE', 1).split('_')[-1].split('.')[0]}"
-PV = "0.1+cvs${FIXEDSRCDATE}"
-PR = "r4"
+SRCREV = "a47f842264fc19837f8a00eb1d2d254a4c527334"
+PV = "1.0+git${SRCPV}"
+PR = "r0"
 
-SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
+SRC_URI = "git://git.sv.gnu.org/config.git;protocol=git \
 	   file://config-guess-uclibc.patch \
            file://gnu-configize.in"
-S = "${WORKDIR}/config"
+
+S = "${WORKDIR}/git"
 
 do_compile() {
 	:
-- 
1.7.6.4

[CONSOLIDATED PULL 10/16] gnu-config: Create 2011111 release

[Saul Wold]

Use a yoctoproject.org based tarball since gnu-config is required very
early on in the native build process, we do not want to rely on git, which
can cause a circular dependency issue.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../gnu-config/gnu-config_20111111.bb              |   41 ++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/gnu-config/gnu-config_20111111.bb

diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
new file mode 100644
index 0000000..27400c6
--- /dev/null
+++ b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
@@ -0,0 +1,41 @@
+SUMMARY = "gnu-configize"
+DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a directory tree"
+SECTION = "devel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=a3669d051b3a8408d69751e53b2e1cc1"
+
+DEPENDS_virtclass-native = "perl-native-runtime"
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+PR = "r0"
+
+SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-yocto-${PV}.tgz \
+	   file://config-guess-uclibc.patch \
+           file://gnu-configize.in"
+
+SRC_URI[md5sum] = "30be385c919a25cd9522205ef49e5328"
+SRC_URI[sha256sum] = "0750afa8d8ee988b6ead1c2d02b565597f809e2e3ad14886ed7803d3bbc8b0cd"
+
+do_compile() {
+	:
+}
+
+do_install () {
+	install -d ${D}${datadir}/gnu-config \
+		   ${D}${bindir}
+	cat ${WORKDIR}/gnu-configize.in | \
+		sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \
+		    -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize
+	# In the native case we want the system perl as perl-native can't have built yet
+	if [ "${BUILD_ARCH}" != "${TARGET_ARCH}" ]; then
+		sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize
+	fi
+	chmod 755 ${D}${bindir}/gnu-configize
+	install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${bindir} ${datadir}/gnu-config"
+
+BBCLASSEXTEND = "native"
-- 
1.7.6.4

[CONSOLIDATED PULL 11/16] bitbake.conf: Update ASSUME_PROVIDED

[Saul Wold]

* Remove an obsolete comment about mercurial
* Remove cvs-native since we have removed cvs SRC_URIs
* Remove svn-native since it's subversion and we can build native correctly

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/conf/bitbake.conf |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 0d6b3b8..a0d7cea 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -146,18 +146,13 @@ DATETIME = "${DATE}${TIME}"
 
 # python-native should be here but python relies on building 
 # its own in staging
-# mercurial-native is required to pull mercurial repositories (hg://...)
-# we don't have it yet in the recipies so let's assume it's provided by
-# the underlying OS
 ASSUME_PROVIDED = "\
     bzip2-native \
-    cvs-native \
     grep-native \
     diffstat-native \
     patch-native \
     perl-native-runtime \
     python-native-runtime \
-    svn-native \
     tar-native \
     texinfo-native \
     virtual/libintl-native \
-- 
1.7.6.4

[CONSOLIDATED PULL 12/16] boost: Update to 1.47.0 & Cleanup

[Saul Wold]

Removed boost-jam-native since it was an older version
no incompatible with boost 1.47.
Modified boost to use BBCLASSEXTEND native for the bjam
native binary.
Removed older unused patches.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/boost/boost-jam-native.inc    |   32 ---
 .../boost/boost-jam-native_3.1.18.bb               |    8 -
 .../boost/{boost-36.inc => boost.inc}              |   42 +++-
 .../boost/{boost_1.44.0.bb => boost_1.47.0.bb}     |   13 +-
 .../recipes-support/boost/files/1.34.1-gcc43.patch |  226 -----------------
 .../boost/files/atomic_count_gcc_atomicity.patch   |   15 --
 meta/recipes-support/boost/files/gcc41.patch       |   16 --
 meta/recipes-support/boost/files/gcc43.patch       |  258 --------------------
 .../recipes-support/boost/files/linux-uclibc.patch |   12 -
 .../boost/files/unit_test_log10f.patch             |   22 --
 10 files changed, 43 insertions(+), 601 deletions(-)
 delete mode 100644 meta/recipes-support/boost/boost-jam-native.inc
 delete mode 100644 meta/recipes-support/boost/boost-jam-native_3.1.18.bb
 rename meta/recipes-support/boost/{boost-36.inc => boost.inc} (88%)
 rename meta/recipes-support/boost/{boost_1.44.0.bb => boost_1.47.0.bb} (66%)
 delete mode 100644 meta/recipes-support/boost/files/1.34.1-gcc43.patch
 delete mode 100644 meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
 delete mode 100644 meta/recipes-support/boost/files/gcc41.patch
 delete mode 100644 meta/recipes-support/boost/files/gcc43.patch
 delete mode 100644 meta/recipes-support/boost/files/linux-uclibc.patch
 delete mode 100644 meta/recipes-support/boost/files/unit_test_log10f.patch

diff --git a/meta/recipes-support/boost/boost-jam-native.inc b/meta/recipes-support/boost/boost-jam-native.inc
deleted file mode 100644
index c5a9d99..0000000
--- a/meta/recipes-support/boost/boost-jam-native.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-# The Boost web site provides free peer-reviewed portable
-# C++ source libraries. The emphasis is on libraries which
-# work well with the C++ Standard Library. The libraries are
-# intended to be widely useful, and are in regular use by
-# thousands of programmers across a broad spectrum of applications.
-DESCRIPTION = "Make system for boost (native)"
-HOMEPAGE = "http://www.boost.org/"
-SECTION = "devel"
-LICENSE = "Boost"
-INC_PR = "r1"
-
-LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz"
-S = "${WORKDIR}/boost-jam-${PV}"
-
-inherit native
-
-do_compile() {
-	set -ex
-	rm -rf bin.*
-	./build.sh gcc
-}
-
-# This is too terrible - the build script doesn't give any good
-# way I can see to find out where the binaries are placed, so
-# rely on only one bin.foo directory being created.
-do_install () {
-	set -ex
-	install -d ${D}${bindir}/
-	install -c -m 755 bin.*/bjam ${D}${bindir}/
-}
diff --git a/meta/recipes-support/boost/boost-jam-native_3.1.18.bb b/meta/recipes-support/boost/boost-jam-native_3.1.18.bb
deleted file mode 100644
index 7a0b1a8..0000000
--- a/meta/recipes-support/boost/boost-jam-native_3.1.18.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include boost-jam-native.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz"
-
-SRC_URI[md5sum] = "f790e022d658db38db5cc4aeeccad3f1"
-SRC_URI[sha256sum] = "85dbb72c29837ba89cb5408782c82459b34fdecaedea8b54ce1cb3cb9990121a"
diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost.inc
similarity index 88%
rename from meta/recipes-support/boost/boost-36.inc
rename to meta/recipes-support/boost/boost.inc
index 8b0622f..ddb65b7 100644
--- a/meta/recipes-support/boost/boost-36.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -6,15 +6,22 @@
 DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
 HOMEPAGE = "http://www.boost.org/"
 SECTION = "libs"
-DEPENDS = "boost-jam-native zlib"
+DEPENDS = "boost-native zlib"
+DEPENDS_virtclass-native = ""
 LICENSE = "Boost"
-PR = "r4"
 
 ARM_INSTRUCTION_SET = "arm"
+
 BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
 BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
+INC_PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
+
+S = "${WORKDIR}/${BOOST_P}"
+
 BOOST_LIBS = "\
 	date_time \
 	filesystem \
@@ -37,8 +44,6 @@ BOOST_LIBS = "\
 #PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}"
 #PYTHON_VERSION = "2.5"
 
-S = "${WORKDIR}/${BOOST_P}"
-
 # Make a package for each library, plus -dev
 PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}"
 python __anonymous () {
@@ -148,3 +153,32 @@ do_install() {
 		--includedir=${D}${includedir} \
 		install
 }
+
+BBCLASSEXTEND = "native"
+
+do_configure_virtclass-native() {
+	:
+}
+
+do_boostconfig_virtclass-native() {
+	:
+}
+
+do_compile_virtclass-native() {
+	set -ex
+	cd ${S}/tools/build/v2/engine
+	rm -rf bin.*
+	./build.sh gcc
+}
+
+# This is too terrible - the build script doesn't give any good
+# way I can see to find out where the binaries are placed, so
+# rely on only one bin.foo directory being created.
+do_install_virtclass-native () {
+	set -ex
+	cd ${S}/tools/build/v2/engine
+	install -d ${D}${bindir}/
+	install -c -m 755 bin.*/bjam ${D}${bindir}/
+}
+
+
diff --git a/meta/recipes-support/boost/boost_1.44.0.bb b/meta/recipes-support/boost/boost_1.47.0.bb
similarity index 66%
rename from meta/recipes-support/boost/boost_1.44.0.bb
rename to meta/recipes-support/boost/boost_1.47.0.bb
index 722149d..e1e0ca1 100644
--- a/meta/recipes-support/boost/boost_1.44.0.bb
+++ b/meta/recipes-support/boost/boost_1.47.0.bb
@@ -1,16 +1,13 @@
-include boost-36.inc
+include boost.inc
 
-LICENSE = "Boost"
 LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
-           file://arm-intrinsics.patch \
-          "
+SRC_URI += "file://arm-intrinsics.patch"
 
-SRC_URI[md5sum] = "f02578f5218f217a9f20e9c30e119c6a"
-SRC_URI[sha256sum] = "45c328029d97d1f1dc7ff8c9527cd0c5cc356636084a800bca2ee4bfab1978db"
+SRC_URI[md5sum] = "a2dc343f7bc7f83f8941e47ed4a18200"
+SRC_URI[sha256sum] = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31"
 
 BJAM_OPTS    = '${BJAM_TOOLS} \
                 --builddir=${S}/${TARGET_SYS} \
diff --git a/meta/recipes-support/boost/files/1.34.1-gcc43.patch b/meta/recipes-support/boost/files/1.34.1-gcc43.patch
deleted file mode 100644
index 172e19a..0000000
--- a/meta/recipes-support/boost/files/1.34.1-gcc43.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-Upstream-Status: Backport
-
-Index: boost_1_34_1/boost/archive/polymorphic_iarchive.hpp
-===================================================================
---- boost_1_34_1.orig/boost/archive/polymorphic_iarchive.hpp	2005-12-11 07:12:51.000000000 +0100
-+++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -17,6 +17,7 @@
- //  See http://www.boost.org for updates, documentation, and revision history.
- 
- #include <cstddef> // std::size_t
-+#include <climits>
- #include <boost/config.hpp>
- 
- #if defined(BOOST_NO_STDC_NAMESPACE)
-Index: boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
-===================================================================
---- boost_1_34_1.orig/boost/archive/polymorphic_oarchive.hpp	2006-02-12 06:43:06.000000000 +0100
-+++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -17,6 +17,7 @@
- //  See http://www.boost.org for updates, documentation, and revision history.
- 
- #include <cstddef> // size_t
-+#include <climits>
- #include <string>
- 
- #include <boost/config.hpp>
-Index: boost_1_34_1/boost/date_time/date_facet.hpp
-===================================================================
---- boost_1_34_1.orig/boost/date_time/date_facet.hpp	2005-09-05 23:10:50.000000000 +0200
-+++ boost_1_34_1/boost/date_time/date_facet.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -429,7 +429,7 @@
-     typedef std::basic_string<CharT> string_type;
-     typedef CharT                    char_type;
-     typedef boost::date_time::period_parser<date_type, CharT>  period_parser_type;
--    typedef special_values_parser<date_type,CharT> special_values_parser_type; 
-+    typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type; 
-     typedef std::vector<std::basic_string<CharT> > input_collection_type;
-     typedef format_date_parser<date_type, CharT> format_date_parser_type;
-     // date_generators stuff goes here
-Index: boost_1_34_1/boost/mpl/zip_view.hpp
-===================================================================
---- boost_1_34_1.orig/boost/mpl/zip_view.hpp	2004-09-02 17:40:42.000000000 +0200
-+++ boost_1_34_1/boost/mpl/zip_view.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -37,7 +37,7 @@
-     typedef zip_iterator<
-           typename transform1<
-                 IteratorSeq
--              , next<_1>
-+              , boost::mpl::next<_1>
-             >::type
-         > next;
- };
-@@ -48,8 +48,8 @@
- struct zip_view
- {
-  private:
--    typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
--    typedef typename transform1< Sequences, end<_1> >::type last_ones_;
-+    typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_;
-+    typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_;
-     
-  public:
-     typedef nested_begin_end_tag tag;
-Index: boost_1_34_1/boost/python/detail/def_helper.hpp
-===================================================================
---- boost_1_34_1.orig/boost/python/detail/def_helper.hpp	2004-09-16 03:00:28.000000000 +0200
-+++ boost_1_34_1/boost/python/detail/def_helper.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -155,7 +155,7 @@
-           , T3 const&
-           , T4 const&
-           , default_call_policies
--          , keywords<0>
-+          , boost::python::detail::keywords<0>
-           , char const*
-           , void(not_specified::*)()   // A function pointer type which is never an
-                                        // appropriate default implementation
-Index: boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp
-===================================================================
---- boost_1_34_1.orig/boost/regex/v4/basic_regex_creator.hpp	2006-07-16 18:06:38.000000000 +0200
-+++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -24,6 +24,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- 
- namespace re_detail{
-Index: boost_1_34_1/boost/regex/v4/basic_regex.hpp
-===================================================================
---- boost_1_34_1.orig/boost/regex/v4/basic_regex.hpp	2007-06-05 19:28:18.000000000 +0200
-+++ boost_1_34_1/boost/regex/v4/basic_regex.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -23,6 +23,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- #ifdef BOOST_MSVC
- #pragma warning(push)
-Index: boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp
-===================================================================
---- boost_1_34_1.orig/boost/regex/v4/basic_regex_parser.hpp	2006-12-20 18:19:05.000000000 +0100
-+++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -23,6 +23,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- namespace re_detail{
- 
-Index: boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp
-===================================================================
---- boost_1_34_1.orig/boost/regex/v4/cpp_regex_traits.hpp	2007-01-15 12:09:44.000000000 +0100
-+++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -41,6 +41,7 @@
- 
- #include <istream>
- #include <ios>
-+#include <climits>
- 
- #ifdef BOOST_HAS_ABI_HEADERS
- #  include BOOST_ABI_PREFIX
-Index: boost_1_34_1/boost/regex/v4/perl_matcher.hpp
-===================================================================
---- boost_1_34_1.orig/boost/regex/v4/perl_matcher.hpp	2006-10-18 14:55:30.000000000 +0200
-+++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -18,6 +18,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- namespace re_detail{
- 
-Index: boost_1_34_1/boost/regex/v4/regex_split.hpp
-===================================================================
---- boost_1_34_1.orig/boost/regex/v4/regex_split.hpp	2005-01-21 18:22:38.000000000 +0100
-+++ boost_1_34_1/boost/regex/v4/regex_split.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -21,6 +21,8 @@
- #ifndef BOOST_REGEX_SPLIT_HPP
- #define BOOST_REGEX_SPLIT_HPP
- 
-+#include <climits>
-+
- namespace boost{
- 
- #ifdef BOOST_HAS_ABI_HEADERS
-Index: boost_1_34_1/boost/regex/v4/states.hpp
-===================================================================
---- boost_1_34_1.orig/boost/regex/v4/states.hpp	2005-09-20 14:01:25.000000000 +0200
-+++ boost_1_34_1/boost/regex/v4/states.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -23,6 +23,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- namespace re_detail{
- 
-Index: boost_1_34_1/boost/serialization/collection_traits.hpp
-===================================================================
---- boost_1_34_1.orig/boost/serialization/collection_traits.hpp	2005-06-21 07:19:04.000000000 +0200
-+++ boost_1_34_1/boost/serialization/collection_traits.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -22,6 +22,7 @@
- // compiles recognize the same set of primitive types, the possibility
- // exists for archives to be non-portable if class information for primitive
- // types is included.  This is addressed by the following macros.
-+#include <climits>
- #include <boost/config.hpp>
- #include <boost/mpl/integral_c.hpp>
- #include <boost/mpl/integral_c_tag.hpp>
-Index: boost_1_34_1/boost/spirit/phoenix/operators.hpp
-===================================================================
---- boost_1_34_1.orig/boost/spirit/phoenix/operators.hpp	2006-08-25 18:27:30.000000000 +0200
-+++ boost_1_34_1/boost/spirit/phoenix/operators.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -24,6 +24,7 @@
- #include <boost/spirit/phoenix/composite.hpp>
- #include <boost/config.hpp>
- #include <boost/mpl/if.hpp>
-+#include <climits>
- 
- ///////////////////////////////////////////////////////////////////////////////
- namespace phoenix {
-Index: boost_1_34_1/boost/test/test_tools.hpp
-===================================================================
---- boost_1_34_1.orig/boost/test/test_tools.hpp	2007-02-22 18:57:29.000000000 +0100
-+++ boost_1_34_1/boost/test/test_tools.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -42,6 +42,7 @@
- #include <boost/mpl/or.hpp>
- 
- // STL
-+#include <climits>
- #include <cstddef>          // for std::size_t
- #include <iosfwd>
- 
-Index: boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
-===================================================================
---- boost_1_34_1.orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2006-12-20 17:38:24.000000000 +0100
-+++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <string>
- #include <cstdio>
- #include <cstdarg>
-+#include <cstring>
- #if defined(BOOST_SPIRIT_DEBUG)
- #include <iostream>
- #endif // defined(BOOST_SPIRIT_DEBUG)
-Index: boost_1_34_1/boost/wave/util/flex_string.hpp
-===================================================================
---- boost_1_34_1.orig/boost/wave/util/flex_string.hpp	2006-04-25 19:21:01.000000000 +0200
-+++ boost_1_34_1/boost/wave/util/flex_string.hpp	2008-09-20 20:55:21.000000000 +0200
-@@ -94,6 +94,7 @@
- #include <limits>
- #include <stdexcept>
- #include <cstddef>
-+#include <cstring>
- 
- // this must occur after all of the includes and before any code appears
- #ifdef BOOST_HAS_ABI_HEADERS
diff --git a/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch b/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
deleted file mode 100644
index 64d5884..0000000
--- a/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport
-
-Index: boost_1_33_1/boost/detail/atomic_count_gcc.hpp
-===================================================================
---- boost_1_33_1.orig/boost/detail/atomic_count_gcc.hpp	2008-05-01 20:43:45.000000000 +0200
-+++ boost_1_33_1/boost/detail/atomic_count_gcc.hpp	2008-05-01 20:43:55.000000000 +0200
-@@ -17,7 +17,7 @@
- //  http://www.boost.org/LICENSE_1_0.txt)
- //
- 
--#include <bits/atomicity.h>
-+#include <ext/atomicity.h>
- 
- namespace boost
- {
diff --git a/meta/recipes-support/boost/files/gcc41.patch b/meta/recipes-support/boost/files/gcc41.patch
deleted file mode 100644
index a1bd57e..0000000
--- a/meta/recipes-support/boost/files/gcc41.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Backport
-
-diff -ur boost_1_33_1.orig/boost/bind.hpp boost_1_33_1/boost/bind.hpp
---- boost_1_33_1.orig/boost/bind.hpp	2008-10-11 10:30:03.000000000 +0200
-+++ boost_1_33_1/boost/bind.hpp	2008-10-11 10:41:25.000000000 +0200
-@@ -28,6 +28,10 @@
- #include <boost/bind/arg.hpp>
- #include <boost/detail/workaround.hpp>
- 
-+#if __GNUC__ == 4 && __GNUC_MINOR__ == 1
-+#  include <boost/visit_each.hpp>
-+#endif
-+
- // Borland-specific bug, visit_each() silently fails to produce code
- 
- #if defined(__BORLANDC__)
diff --git a/meta/recipes-support/boost/files/gcc43.patch b/meta/recipes-support/boost/files/gcc43.patch
deleted file mode 100644
index dbf980d..0000000
--- a/meta/recipes-support/boost/files/gcc43.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-Upstream-Status: Backport
-
-diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp
---- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp	2005-12-11 00:12:51.000000000 -0600
-+++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -17,6 +17,7 @@
- //  See http://www.boost.org for updates, documentation, and revision history.
- 
- #include <cstddef> // std::size_t
-+#include <climits>
- #include <boost/config.hpp>
- 
- #if defined(BOOST_NO_STDC_NAMESPACE)
-diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
---- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp	2006-02-11 23:43:06.000000000 -0600
-+++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -17,6 +17,7 @@
- //  See http://www.boost.org for updates, documentation, and revision history.
- 
- #include <cstddef> // size_t
-+#include <climits>
- #include <string>
- 
- #include <boost/config.hpp>
-diff -aNru boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp boost_1_34_1/boost/date_time/date_facet.hpp
---- boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp	2005-09-05 16:10:50.000000000 -0500
-+++ boost_1_34_1/boost/date_time/date_facet.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -429,7 +429,7 @@
-     typedef std::basic_string<CharT> string_type;
-     typedef CharT                    char_type;
-     typedef boost::date_time::period_parser<date_type, CharT>  period_parser_type;
--    typedef special_values_parser<date_type,CharT> special_values_parser_type; 
-+    typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type; 
-     typedef std::vector<std::basic_string<CharT> > input_collection_type;
-     typedef format_date_parser<date_type, CharT> format_date_parser_type;
-     // date_generators stuff goes here
-diff -aNru boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp boost_1_34_1/boost/mpl/zip_view.hpp
---- boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp	2004-09-02 10:40:42.000000000 -0500
-+++ boost_1_34_1/boost/mpl/zip_view.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -37,7 +37,7 @@
-     typedef zip_iterator<
-           typename transform1<
-                 IteratorSeq
--              , next<_1>
-+              , boost::mpl::next<_1>
-             >::type
-         > next;
- };
-@@ -48,8 +48,8 @@
- struct zip_view
- {
-  private:
--    typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
--    typedef typename transform1< Sequences, end<_1> >::type last_ones_;
-+    typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_;
-+    typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_;
-     
-  public:
-     typedef nested_begin_end_tag tag;
-diff -aNru boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp boost_1_34_1/boost/python/detail/def_helper.hpp
---- boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp	2004-09-15 20:00:28.000000000 -0500
-+++ boost_1_34_1/boost/python/detail/def_helper.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -155,7 +155,7 @@
-           , T3 const&
-           , T4 const&
-           , default_call_policies
--          , keywords<0>
-+          , boost::python::detail::keywords<0>
-           , char const*
-           , void(not_specified::*)()   // A function pointer type which is never an
-                                        // appropriate default implementation
-diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp
---- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp	2006-07-16 11:06:38.000000000 -0500
-+++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -24,6 +24,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- 
- namespace re_detail{
-diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp boost_1_34_1/boost/regex/v4/basic_regex.hpp
---- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp	2007-06-05 12:28:18.000000000 -0500
-+++ boost_1_34_1/boost/regex/v4/basic_regex.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -23,6 +23,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- #ifdef BOOST_MSVC
- #pragma warning(push)
-diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp
---- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp	2006-12-20 11:19:05.000000000 -0600
-+++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -23,6 +23,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- namespace re_detail{
- 
-diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp
---- boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp	2007-01-15 05:09:44.000000000 -0600
-+++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -41,6 +41,7 @@
- 
- #include <istream>
- #include <ios>
-+#include <climits>
- 
- #ifdef BOOST_HAS_ABI_HEADERS
- #  include BOOST_ABI_PREFIX
-diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp boost_1_34_1/boost/regex/v4/perl_matcher.hpp
---- boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp	2006-10-18 07:55:30.000000000 -0500
-+++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -18,6 +18,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- namespace re_detail{
- 
-diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp boost_1_34_1/boost/regex/v4/regex_split.hpp
---- boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp	2005-01-21 11:22:38.000000000 -0600
-+++ boost_1_34_1/boost/regex/v4/regex_split.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -21,6 +21,8 @@
- #ifndef BOOST_REGEX_SPLIT_HPP
- #define BOOST_REGEX_SPLIT_HPP
- 
-+#include <climits>
-+
- namespace boost{
- 
- #ifdef BOOST_HAS_ABI_HEADERS
-diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp boost_1_34_1/boost/regex/v4/states.hpp
---- boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp	2005-09-20 07:01:25.000000000 -0500
-+++ boost_1_34_1/boost/regex/v4/states.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -23,6 +23,8 @@
- #  include BOOST_ABI_PREFIX
- #endif
- 
-+#include <climits>
-+
- namespace boost{
- namespace re_detail{
- 
-diff -aNru boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp boost_1_34_1/boost/serialization/collection_traits.hpp
---- boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp	2005-06-21 00:19:04.000000000 -0500
-+++ boost_1_34_1/boost/serialization/collection_traits.hpp	2008-03-03 03:09:49.000000000 -0600
-@@ -22,6 +22,7 @@
- // compiles recognize the same set of primitive types, the possibility
- // exists for archives to be non-portable if class information for primitive
- // types is included.  This is addressed by the following macros.
-+#include <climits>
- #include <boost/config.hpp>
- #include <boost/mpl/integral_c.hpp>
- #include <boost/mpl/integral_c_tag.hpp>
-diff -aNru boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp boost_1_34_1/boost/spirit/phoenix/operators.hpp
---- boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp	2006-08-25 11:27:30.000000000 -0500
-+++ boost_1_34_1/boost/spirit/phoenix/operators.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -24,6 +24,7 @@
- #include <boost/spirit/phoenix/composite.hpp>
- #include <boost/config.hpp>
- #include <boost/mpl/if.hpp>
-+#include <climits>
- 
- ///////////////////////////////////////////////////////////////////////////////
- namespace phoenix {
-diff -aNru boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp boost_1_34_1/boost/test/test_tools.hpp
---- boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp	2007-02-22 11:57:29.000000000 -0600
-+++ boost_1_34_1/boost/test/test_tools.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -42,6 +42,7 @@
- #include <boost/mpl/or.hpp>
- 
- // STL
-+#include <climits>
- #include <cstddef>          // for std::size_t
- #include <iosfwd>
- 
-diff -aNru boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
---- boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2006-12-20 10:38:24.000000000 -0600
-+++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -16,6 +16,7 @@
- #include <string>
- #include <cstdio>
- #include <cstdarg>
-+#include <cstring>
- #if defined(BOOST_SPIRIT_DEBUG)
- #include <iostream>
- #endif // defined(BOOST_SPIRIT_DEBUG)
-diff -aNru boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp boost_1_34_1/boost/wave/util/flex_string.hpp
---- boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp	2006-04-25 12:21:01.000000000 -0500
-+++ boost_1_34_1/boost/wave/util/flex_string.hpp	2008-03-03 03:08:59.000000000 -0600
-@@ -94,6 +94,7 @@
- #include <limits>
- #include <stdexcept>
- #include <cstddef>
-+#include <cstring>
- 
- // this must occur after all of the includes and before any code appears
- #ifdef BOOST_HAS_ABI_HEADERS
- 
---- boost_1_33_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2008-07-05 01:50:04.000000000 +0200
-+++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2006-12-20 17:38:24.000000000 +0100
-@@ -295,17 +325,20 @@
-     
-     lex_functor(IteratorT const &first, IteratorT const &last, 
-             PositionT const &pos, boost::wave::language_support language)
--    :   lexer(first, last, pos, language)
-+    :   re2c_lexer(first, last, pos, language)
-     {}
-     virtual ~lex_functor() {}
-     
- // get the next token from the input stream
--    token_type get() { return lexer.get(); }
--    void set_position(PositionT const &pos) 
--    { lexer.set_position(pos); }
-+    token_type get() { return re2c_lexer.get(); }
-+    void set_position(PositionT const &pos) { re2c_lexer.set_position(pos); }
-+#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
-+    bool has_include_guards(std::string& guard_name) const 
-+        { return re2c_lexer.has_include_guards(guard_name); }
-+#endif    
- 
- private:
--    lexer<IteratorT, PositionT> lexer;
-+    lexer<IteratorT, PositionT> re2c_lexer;
- };
- 
- ///////////////////////////////////////////////////////////////////////////////
-@@ -338,7 +371,7 @@
- //  It is coupled to the iterator type to allow to decouple the lexer/iterator 
- //  configurations at compile time.
- //
--//  This function is declared inside the cpp_slex_token.hpp file, which is 
-+//  This function is declared inside the cpp_lex_token.hpp file, which is 
- //  referenced by the source file calling the lexer and the source file, which
- //  instantiates the lex_functor. But is is defined here, so it will be 
- //  instantiated only while compiling the source file, which instantiates the 
-@@ -356,8 +389,8 @@
-     IteratorT const &last, PositionT const &pos, 
-     boost::wave::language_support language)
- {
--    return new re2clex::lex_functor<IteratorT, PositionT>(first, last, pos,
--        language);
-+    using re2clex::lex_functor;
-+    return new lex_functor<IteratorT, PositionT>(first, last, pos, language);
- }
- 
- #undef BOOST_WAVE_RE2C_NEW_LEXER_INLINE
diff --git a/meta/recipes-support/boost/files/linux-uclibc.patch b/meta/recipes-support/boost/files/linux-uclibc.patch
deleted file mode 100644
index 470e084..0000000
--- a/meta/recipes-support/boost/files/linux-uclibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
---- /dev/null	1969-12-31 16:00:00.000000000 -0800
-+++ boost_1_32_0/boost/config/platform/linux-uclibc.hpp	2005-07-05 14:51:56.237294460 -0700
-@@ -0,0 +1,7 @@
-+// Modifications required to support uClibC libc implementation.
-+// Default to Linux...
-+#include "linux.hpp"
-+
-+// Override anything uClibC doesn't support.
-+// At present (0.9.27) the nl_types.h header exists but is not implemented
-+#undef BOOST_HAS_NL_TYPES_H
diff --git a/meta/recipes-support/boost/files/unit_test_log10f.patch b/meta/recipes-support/boost/files/unit_test_log10f.patch
deleted file mode 100644
index 8eec589..0000000
--- a/meta/recipes-support/boost/files/unit_test_log10f.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Backport
-
---- boost_1_32_0/libs/test/src/unit_test_result.cpp.orig	2005-07-05 11:00:53.887594850 -0700
-+++ boost_1_32_0/libs/test/src/unit_test_result.cpp	2005-07-05 11:01:20.683533034 -0700
-@@ -144,7 +144,7 @@
-                                         unit_test_counter num_passed, unit_test_counter num_failed )
-     {
-         unit_test_counter total_test_cases = num_passed + num_failed;
--        std::size_t       width = static_cast<std::size_t>( std::log10( (float)(std::max)( num_passed, num_failed ) ) ) + 1;
-+        std::size_t       width = static_cast<std::size_t>( std::log10( (double)(std::max)( num_passed, num_failed ) ) ) + 1;
- 
-         where_to << std::setw( indent ) << "" << std::setw( width ) << num_passed
-                  << " test " << ps_name( num_passed != 1, "case" ) << " out of " << total_test_cases << " passed\n"
-@@ -158,7 +158,7 @@
-     {
-         unit_test_counter total_assertions = num_passed + num_failed;
-         std::size_t       width            = total_assertions > 0 
--                                               ? static_cast<std::size_t>( std::log10( (float)(std::max)( num_passed, num_failed ) ) ) + 1
-+                                               ? static_cast<std::size_t>( std::log10( (double)(std::max)( num_passed, num_failed ) ) ) + 1
-                                                : 1;
-         
-         where_to << std::setw( indent ) << "" << std::setw( width ) << num_passed 
-- 
1.7.6.4

[CONSOLIDATED PULL 13/16] gcc-4.6: fix toolchain build for SH4

[Saul Wold]

From: Michael Brown <Michael_E_Brown@Dell.com>

Signed-off-by: Michael Brown <Michael_E_Brown@dell.com>

Port patch from base openembedded. Since 4.6 already has fixes for config.gcc,
the fix only requires a one line change to gcc-cross4.inc.

The patch was imported from the OpenEmbedded git server
(git://git.openembedded.org/openembedded) as of commit id
3aa8afe97e9cf1340feb9c4442a6ed88b7e32c96.

gcc-4.5: Fix toolchain builds for SH4/SH3

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/gcc/gcc-cross4.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-cross4.inc b/meta/recipes-devtools/gcc/gcc-cross4.inc
index ea20a24..4a20818 100644
--- a/meta/recipes-devtools/gcc/gcc-cross4.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross4.inc
@@ -1 +1,3 @@
 require gcc-cross.inc
+
+EXTRA_OECONF_append_sh4 = " --with-multilib-list= --enable-incomplete-targets "
-- 
1.7.6.4

[CONSOLIDATED PULL 14/16] screenshot: rename to sato-screenshot

[Saul Wold]

From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

To remove a name conflict with e17's screenshot tool (and possibly other
screenshot tools, as screenshot is a generic term), rename screenshot
to sato-screenshot.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 .../files/fix_ldadd_order.patch                    |    0
 .../sato-screenshot_git.bb}                        |    2 +-
 meta/recipes-sato/tasks/task-core-x11.bb           |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/{screenshot => sato-screenshot}/files/fix_ldadd_order.patch (100%)
 rename meta/recipes-sato/{screenshot/screenshot_git.bb => sato-screenshot/sato-screenshot_git.bb} (92%)

diff --git a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
similarity index 100%
rename from meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
rename to meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
diff --git a/meta/recipes-sato/screenshot/screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
similarity index 92%
rename from meta/recipes-sato/screenshot/screenshot_git.bb
rename to meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
index 917a27d..5e51d3d 100644
--- a/meta/recipes-sato/screenshot/screenshot_git.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
@@ -12,7 +12,7 @@ SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945"
 PV = "0.1+git${SRCPV}"
 PR = "r0"
 
-SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \
            file://fix_ldadd_order.patch"
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/tasks/task-core-x11.bb
index 106bc0f..f1b06f9 100644
--- a/meta/recipes-sato/tasks/task-core-x11.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -61,7 +61,7 @@ RDEPENDS_task-core-apps-x11-core = "\
     leafpad \
     ${FILEMANAGER} \
     matchbox-terminal \
-    screenshot"
+    sato-screenshot"
 
 
 RDEPENDS_task-core-apps-x11-games = "\
-- 
1.7.6.4

[CONSOLIDATED PULL 15/16] gobject-introspection: update frome meta-oe

[Saul Wold]

From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

OE-Core uses very old version of gobject-introspection. The recipe says
0.10.8, but in reality it's GOBJECT_INTROSPECTION_0_6_3-41-gefa7266.
That version e.g. doesn't compile with python 2.7 (default in some
versions), etc.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 .../gnome/gobject-introspection/configure.patch    |   27 ----------------
 .../gnome/gobject-introspection/pathfix.patch      |   27 ----------------
 .../use-usr-bin-env-for-python.patch               |   20 ++++++++++++
 .../gnome/gobject-introspection_git.bb             |   32 +++++++++++--------
 4 files changed, 38 insertions(+), 68 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/gobject-introspection/configure.patch
 delete mode 100644 meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
 create mode 100644 meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch

diff --git a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
deleted file mode 100644
index 5dcd9b0..0000000
--- a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/common.mk
-===================================================================
---- git.orig/common.mk	2009-08-19 11:11:26.000000000 +0100
-+++ git/common.mk	2009-08-19 11:12:05.000000000 +0100
-@@ -4,7 +4,7 @@
- 	UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
- 	UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
- SCANNER_ARGS = -v --add-include-path=$(top_builddir)/gir --add-include-path=.
--SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS)
-+SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) g-ir-scanner $(SCANNER_ARGS)
- SCANNER_LIBS = \
- 	$(top_srcdir)/giscanner/*.py \
- 	$(top_builddir)/giscanner/libgiscanner.la \
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2009-08-19 11:11:26.000000000 +0100
-+++ git/configure.ac	2009-08-19 11:11:28.000000000 +0100
-@@ -201,7 +201,6 @@
- 	pyexecdir=`echo $pyexecdir | tr '\\\\' '/'`
- 	;;
- esac
--AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
- 
- AC_CONFIG_FILES([
- Makefile
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
deleted file mode 100644
index a96e4b1..0000000
--- a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/giscanner/dumper.py
-===================================================================
---- git.orig/giscanner/dumper.py	2010-11-29 15:14:35.000000000 -0800
-+++ git/giscanner/dumper.py	2010-11-29 15:14:57.115747154 -0800
-@@ -82,7 +82,7 @@
-         self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd())
- 
-         self._compiler_cmd = os.environ.get('CC', 'gcc')
--        self._linker_cmd = os.environ.get('LD', self._compiler_cmd)
-+        self._linker_cmd = os.environ.get('CCLD', self._compiler_cmd)
-         self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')
- 
-         self._uninst_srcdir = os.environ.get(
-Index: git/giscanner/scannermain.py
-===================================================================
---- git.orig/giscanner/scannermain.py	2010-11-29 15:14:35.000000000 -0800
-+++ git/giscanner/scannermain.py	2010-11-29 15:14:57.120747321 -0800
-@@ -283,6 +283,7 @@
-     shown_include_warning = False
-     for include in options.includes:
-         if os.sep in include:
-+            continue
-             raise ValueError("Invalid include path %r" % (include, ))
-         include_obj = Include.from_string(include)
-         transformer.register_include(include_obj)
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch b/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
new file mode 100644
index 0000000..67b8547
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
@@ -0,0 +1,20 @@
+Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
+===================================================================
+--- gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in
++++ gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
+@@ -1,4 +1,4 @@
+-#!@PYTHON@
++#!/usr/bin/env python
+ # -*- Mode: Python -*-
+ # GObject-Introspection - a framework for introspecting GObject libraries
+ # Copyright (C) 2008  Johan Dahlin
+Index: gobject-introspection-0.9.10/tools/g-ir-scanner.in
+===================================================================
+--- gobject-introspection-0.9.10.orig/tools/g-ir-scanner.in
++++ gobject-introspection-0.9.10/tools/g-ir-scanner.in
+@@ -1,4 +1,4 @@
+-#!@PYTHON@
++#!/usr/bin/env python
+ # -*- Mode: Python -*-
+ # GObject-Introspection - a framework for introspecting GObject libraries
+ # Copyright (C) 2008  Johan Dahlin
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
index 5e37255..8352384 100644
--- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb
+++ b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
@@ -1,29 +1,33 @@
-SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \
-           file://configure.patch \
-           file://pathfix.patch"
+# NOTE: WIP! This recipe does not cross-compile atm., only -native
+DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
+DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native"
+BBCLASSEXTEND = "native"
 
-SRC_URI_virtclass-native = "git://git.gnome.org/gobject-introspection;protocol=git \
-                            file://pathfix.patch"
+SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \
+  file://use-usr-bin-env-for-python.patch \
+"
 
 LICENSE = "GPLv2+ & LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-SRCREV = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
-PV = "0.10.8+git${SRCPV}"
-PR = "r4"
+SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21"
+PV = "1.29.0+gitr${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "libffi python-native gobject-introspection-native"
-DEPENDS_virtclass-native = "libffi-native python-native bison-native flex-native"
-
 inherit autotools
 
-TARGET_CFLAGS += "-I${STAGING_INCDIR_NATIVE}/python2.5"
+BBCLASSEXTEND = "native"
 
 do_configure_prepend () {
-	echo "EXTRA_DIST = " > ${S}/gtk-doc.make
+        echo "EXTRA_DIST = " > ${S}/gtk-doc.make
 }
 
-BBCLASSEXTEND = "native"
+EXTRA_OECONF = "\
+  --disable-gtk-doc \
+  --disable-gtk-doc-html \
+  --disable-gtk-doc-pdf \
+  --disable-tests \
+"
-- 
1.7.6.4

[CONSOLIDATED PULL 16/16] distro_tracking: Refect Recipe Updates & Status

[Saul Wold]

 * libnl    - NO_UPDATE_REASON due to incompatibility
 * zlib     - has wrong version in update list (121)
 * libtasn1 - Update to 2.10
 * pkgconfig - NO_UPDATE_REASON due to removal of glib-conf
 * file     - update to 5.09
 * dchp     - New version is 4.2.3, not updated yet.
 * tiff     - NO_UPDATE_REASON wait until 4.0.0
 * gobject-interopsectio - NO_UPDATE_REASON can not cross-build
 * gnu-config  - Udpate to git HEAD - requires ASSUME_PROVIDED += "git-native"
 * boost    - remove boost-jam-native since it's part of 1.47.0 Update

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   50 ++++++++++----------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 5cd4c37..e15ab20 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -382,6 +382,7 @@ RECIPE_MAINTAINER_pn-libnl = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_LATEST_VERSION_pn-libnl = "2.0"
 RECIPE_INTEL_SECTION_pn-libnl = "base libs"
 RECIPE_LATEST_RELEASE_DATE_pn-libnl = "Oct 01, 2010"
+RECIPE_NO_UPDATE_REASON_pn-libnl = "libnl-3.2.2 is incompatible with libnl2, so no Upgrade"
 
 RECIPE_STATUS_pn-zlib = "yellow"  # local config scripts
 RECIPE_LAST_UPDATE_pn-zlib = "Jun 11, 2010"
@@ -394,6 +395,7 @@ RECIPE_INTEL_SECTION_pn-zlib = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-zlib = "3 months"
 RECIPE_LATEST_RELEASE_DATE_pn-zlib = "Mar 01, 2010"
 RECIPE_COMMENTS_pn-zlib = "rconflicts: libxml2 (< 2.7.7) (rbreaks)"
+RECIPE_NO_UPDATE_REASON_pn-zlib = "zlib-1.2.5 is latest, version parser reports 121 in error"
 
 RECIPE_STATUS_pn-libxml2 = "yellow"
 RECIPE_LAST_UPDATE_pn-libxml2 = "Jun 18, 2010"
@@ -452,15 +454,15 @@ RECIPE_INTEL_SECTION_pn-lzo = "base libs"
 RECIPE_LATEST_RELEASE_DATE_pn-lzo = "Oct 01, 2010"
 
 RECIPE_STATUS_pn-libtasn1 = "green"
-RECIPE_LAST_UPDATE_pn-libtasn1 = "Dec 06, 2010"
+RECIPE_LATEST_VERSION_pn-libtasn1 = "2.10"
+RECIPE_LATEST_RELEASE_DATE_pn-libtasn1 = "Oct 25, 2011"
+RECIPE_LAST_UPDATE_pn-libtasn1 = "Nov 08, 2011"
 RECIPE_MAINTAINER_pn-libtasn1 = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-libtasn1 = "not done"
-RECIPE_LATEST_VERSION_pn-libtasn1 = "2.9"
 RECIPE_INTEL_SECTION_pn-libtasn1 = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libtasn1 = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-libtasn1 = "Dec 06, 2010"
 RECIPE_COMMENTS_pn-libtasn1 = ""
-RECIPE_MANUAL_CHECK_DATE_pn-libtasn1 = "Sep 27, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libtasn1 = "Nov 08, 2011"
 
 RECIPE_STATUS_pn-openssl = "green"
 RECIPE_LAST_UPDATE_pn-openssl = "Nov 17, 2010"
@@ -1318,17 +1320,10 @@ RECIPE_MAINTAINER_pn-psmisc = "Yu Ke <ke.yu@intel.com>"
 RECIPE_STATUS_pn-boost = "yellow"
 RECIPE_LATEST_VERSION_pn-boost = "1.47.0"
 RECIPE_LATEST_RELEASE_DATE_pn-boost = "Jul 12, 2011"
-RECIPE_LAST_UPDATE_pn-boost = "Aug 19, 2010"
+RECIPE_LAST_UPDATE_pn-boost = "Nov 11, 2010"
 RECIPE_MANUAL_CHECK_DATE_pn-boost = "Nov 08, 2011"
 RECIPE_MAINTAINER_pn-boost = "Saul Wold <sgw@linux.intel.com>"
 
-RECIPE_STATUS_pn-boost-jam-native = "green"
-RECIPE_LATEST_VERSION_pn-boost-jam-native = "3.1.18"
-RECIPE_LATEST_RELEASE_DATE_pn-boost-jam-native = "Mar 22, 2011"
-RECIPE_LAST_UPDATE_pn-boost-jam-native = "Aug 19, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-boost-jam-native = "Nov 08, 2011"
-RECIPE_MAINTAINER_pn-boost-jam-native = "Saul Wold <sgw@linux.intel.com>"
-
 RECIPE_STATUS_pn-libfribidi = "red"
 DISTRO_PN_ALIAS_pn-libfribidi = "OpenSuSE=fribidi Ubuntu=fribidi Mandriva=fribidi Debian=fribidi"
 RECIPE_LATEST_VERSION_pn-libfribidi = "0.19.2"
@@ -1504,14 +1499,15 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-elfutils="1 month"
 RECIPE_LATEST_RELEASE_DATE_pn-elfutils="Jun 01, 2010"
 
 RECIPE_STATUS_pn-pkgconfig = "green"
+RECIPE_LATEST_VERSION_pn-pkgconfig = "0.26"
+RECIPE_LATEST_RELEASE_DATE_pn-pkgconfig = "May 15, 2011"
 RECIPE_LAST_UPDATE_pn-pkgconfig = "Jul 13, 2010"
 RECIPE_MAINTAINER_pn-pkgconfig = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-pkgconfig = "not done"
-RECIPE_LATEST_VERSION_pn-pkgconfig = "0.25"
 RECIPE_INTEL_SECTION_pn-pkgconfig = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-pkgconfig = "n/a"
-RECIPE_LATEST_RELEASE_DATE_pn-pkgconfig = "May 01, 2010"
-RECIPE_COMMENTS_pn-pkgconfig = "git as candidate, 0.23: Jan 01, 2008, 0.24: 05/2010, 0.25: 05/2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-pkgconfig = "1 year"
+RECIPE_COMMENTS_pn-pkgconfig = ""
+RECIPE_NO_UPDATE_REASON_pn-pkgconfig = "0.26 removes glib-conf, adds circular depends"
 
 RECIPE_STATUS_pn-less = "green"
 RECIPE_LAST_UPDATE_pn-less = "May 24, 2011"
@@ -1548,17 +1544,17 @@ RECIPE_LATEST_RELEASE_DATE_pn-findutils = "Jun 01, 2009"
 RECIPE_COMMENTS_pn-findutils = ""
 
 RECIPE_STATUS_pn-file = "green"
+RECIPE_LATEST_VERSION_pn-file = "5.09"
+RECIPE_LATEST_RELEASE_DATE_pn-file = "Sep 16, 2011"
 RECIPE_LAST_UPDATE_pn-file = "Jul 12, 2011"
 RECIPE_MAINTAINER_pn-file = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-file = "done"
-RECIPE_LATEST_VERSION_pn-file = "5.09"
 RECIPE_PATCH_pn-file+dump = "some new magic data"
 RECIPE_PATCH_pn-file+filesystems = "some other new magic data"
 RECIPE_INTEL_SECTION_pn-file = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-file = "1-3 months"
-RECIPE_LATEST_RELEASE_DATE_pn-file = "Sep 16, 2011"
 RECIPE_COMMENTS_pn-file = "2-clause BSD"
-RECIPE_MANUAL_CHECK_DATE_pn-file = "Sep 27, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-file = "Nov 08, 2011"
 
 RECIPE_STATUS_pn-rsync = "green"
 RECIPE_LAST_UPDATE_pn-rsync = "Jul 6, 2010"
@@ -1690,9 +1686,9 @@ RECIPE_LATEST_RELEASE_DATE_pn-strace = "Apr 01, 2010"
 RECIPE_COMMENTS_pn-strace = "3-clause BSD"
 
 RECIPE_STATUS_pn-dhcp = "green"
+RECIPE_LATEST_VERSION_pn-dhcp = "4.2.3
+RECIPE_LATEST_RELEASE_DATE_pn-dhcp = "Oct 19, 2011
 RECIPE_LAST_UPDATE_pn-dhcp = "Sep 28, 2011"
-RECIPE_LATEST_VERSION_pn-dhcp = "4.2.2
-RECIPE_LATEST_RELEASE_DATE_pn-dhcp = "Aug 10, 2011
 RECIPE_MAINTAINER_pn-dhcp = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_INTEL_SECTION_pn-dhcp = "base utils"
 RECIPE_COMMENTS_pn-dhcp = "several major release, others are 3.1.3, 4.0.2-P1, need to identify"
@@ -1929,6 +1925,7 @@ RECIPE_LATEST_VERSION_pn-tiff = "3.9.5"
 RECIPE_LAST_UPDATE_pn-tiff = "Jul 12, 2011"
 RECIPE_MAINTAINER_pn-tiff = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MANUAL_CHECK_DATE_pn-tiff = "Jul 12, 2011"
+RECIPE_NO_UPDATE_REASON_pn-tiff = "Wait until 4.0.0 releases"
 
 RECIPE_STATUS_pn-libexif = "green"
 RECIPE_LATEST_VERSION_pn-libexif = "0.6.20"
@@ -3106,10 +3103,10 @@ RECIPE_LATEST_VERSION_pn-unifdef="2.6.18+git"
 RECIPE_MAINTAINER_pn-unifdef = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
 RECIPE_STATUS_pn-gnu-config="green" 
-RECIPE_LATEST_VERSION_pn-gnu-config="svn"
+RECIPE_LATEST_VERSION_pn-gnu-config="git"
 DISTRO_PN_ALIAS_pn-gnu-config = "OpenedHand"
-RECIPE_LAST_UPDATE_pn-gnu-config = "Jun 21, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-gnu-config = "Oct 18, 2011" 
+RECIPE_LAST_UPDATE_pn-gnu-config = "Nov 08, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-gnu-config = "Nov 08, 2011"
 RECIPE_MAINTAINER_pn-gnu-config = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
 RECIPE_STATUS_pn-mpfr="green"
@@ -5137,7 +5134,10 @@ RECIPE_NO_OF_PATCHES_pn-gobject-introspection = "3"
 RECIPE_INTEL_SECTION_pn-gobject-introspection = "graphic UX"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gobject-introspection = "1 months"
 RECIPE_LATEST_RELEASE_DATE_pn-gobject-introspection = "Sep 01, 2010"
-RECIPE_COMMENTS_pn-gobject-introspection = ""
+RECIPE_COMMENTS_pn-gobject-introspection = "m4 files are used but upstream source is not cross-compile-able"
+RECIPE_NO_UPDATE_REASON_pn-gobject_introspection = "Does not cross-compile"
+RECIPE_MAINTAINER_pn-gobject-introspection = "Kai Kang <kai.kang@windriver.org>"
+
 RECIPE_LAST_UPDATE_pn-gnome-common = "Jul 7, 2010"
 RECIPE_MAINTAINER_pn-gnome-common = "Zhai Edwin <edwin.zhai@intel.com>"
 
-- 
1.7.6.4