[PATCH 00/46] Enhance uclibc support

[PATCH 00/46] Enhance uclibc support

[Khem Raj]

This patchset enables uclibc based image generation on oe-core
It changes usage of inheriting gettext and removing gettext from
depends so that it can use virtual/libintl to specify depends for
libintl Most of patches are for this change. 

I have changed the target triplet from -uclibcgnueabi to -uclibceabi
thats been same in OE too.


I have not proposed uclibc recipes itself which I have proposed for
meta-openembedded eventually it should be in oe-core I thought 
it would be better to do that after 0.9.32 releases.

I am able to build console-image/angstrom for arm mips ppc
x86 and x86-64 and boot them on QEMU

I have also made sure that it does not cause any regression
for eglibc based systems.

Please review and apply

Pull URL: git://git.openembedded.org/openembedded-core-contrib
  Branch: kraj/uclibc
  Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/uclibc

Thanks,
    Khem Raj <raj.khem@gmail.com>
---


Khem Raj (46):
  sanity.bbclass: Use SSTATE_MANIFESTS instead of hard coding
    sstate-control
  classes: Use virtual/libintl instead of gettext
  classes: Use linux-uclibceabi instead of linux-uclibgnuceabi for os
    portion of triplet
  site: Add mips-linux-uclibc site file and add to x86_64-linux-uclibc
  conf/distro/poky.conf: Use -uclibceabi instead of -uclibgnuceabi
  recipes: Use -uclibceabi instead of -uclibcgnueabi
  libiconv: update from 1.9.2 -> 1.11.1
  avahi.inc: Conditionalize RECOMMENDS by using overrides
  galago: inherit gettext class instead of adding gettext to DEPENDS
    directly
  telepathy-glib_0.13.6.bb: inherit gettext class instead of adding
    gettext to DEPENDS directly
  console-tools_0.3.2.bb: inherit gettext
  coreutils_6.9.bb: Remove gettext from DEPENDS
  gettext_0.17.bb: Use linux-uclibceabi instead of linux-uclibcgnueabi
  glib-2.0: Inherit gettext should provide right libintl so remove from
    DEPENDS
  util-linux.inc: remove virtual/libintl from DEPENDS
  binutils: Use arm*-*-linux-uclibceabi instead of
    arm*-*-linux-uclibcgnueabi
  bison: Make compilable on uclibc
  diffstat_1.54.bb: inherit gettext class instead of adding gettext to
    DEPENDS directly
  libpam_1.1.3.bb: Fix compilation on uclibc when innetgr is absent
  alsa-utils_1.0.23.bb: Remove xmlto requirement
  liboil_0.3.17.bb: Enable x86_64 unaligned memory access
  e2fsprogs.inc: inherit gettext class instead of adding gettext to
    DEPENDS directly
  flex.inc: inherit gettext class instead of adding gettext to DEPENDS
    directly
  elfutils_0.148.bb: Fix compilation issues on uclibc
  gcc-runtime_4.5.1.bb: Do not filter out -feliminate-dwarf2-dups
  perl_5.12.2.bb: By defualt undefine features not found in uclibc
  xorg-proto: inherit gettext class instead of adding gettext to
    DEPENDS directly
  xorg-lib: inherit gettext class instead of adding gettext to DEPENDS
    directly
  attr: Fix compilation on uclibc
  sed: inherit gettext class instead of adding gettext to DEPENDS
    directly
  chkconfig_1.3.49.bb: inherit gettext class instead of adding gettext
    to DEPENDS directly
  libuser_0.57.1.bb: inherit gettext class instead of adding gettext to
    DEPENDS directly
  libzypp_git.bb: inherit gettext class instead of adding gettext to
    DEPENDS directly
  xz_5.0.0.bb: inherit gettext class instead of adding gettext to
    DEPENDS directly
  gdk-pixbuf_2.22.1.bb: inherit gettext class instead of adding gettext
    to DEPENDS directly
  libgdata_0.7.1.bb: inherit gettext class instead of adding gettext to
    DEPENDS directly
  popt_1.16.bb: inherit gettext class instead of adding gettext to
    DEPENDS directly
  libgpg-error: inherit gettext class instead of adding gettext to
    DEPENDS directly
  clutter.inc: inherit gettext class instead of adding gettext to
    DEPENDS directly
  libxcb.inc: Replace XCBPROTO_XCBPYTHONDIR to point to staging area
  util-macros_1.11.0.bb: inherit gettext class instead of adding
    gettext to DEPENDS directly
  gstreamer_0.10.31.bb: inherit gettext class instead of adding gettext
    to DEPENDS directly
  gnutls.inc: inherit gettext class instead of adding gettext to
    DEPENDS directly
  libcap.inc: Pass SYSTEM_HEADERS to make
  libexif_0.6.16.bb: inherit gettext class instead of adding gettext to
    DEPENDS directly
  linux-tools.inc: Dummify do_compile_perf and do_install_perf for
    uclibc

 meta/classes/autotools.bbclass                     |    8 +-
 meta/classes/gettext.bbclass                       |    8 +-
 meta/classes/insane.bbclass                        |   25 ++--
 meta/classes/sanity.bbclass                        |    2 +-
 meta/classes/siteinfo.bbclass                      |    4 +-
 meta/conf/distro/poky.conf                         |    2 +-
 .../pciutils/pciutils-3.1.7/configure.patch        |    2 +-
 .../pciutils/pciutils-3.1.7/guess-fix.patch        |    2 +-
 meta/recipes-connectivity/avahi/avahi.inc          |   10 +-
 .../galago/galago-daemon_0.5.1.bb                  |    4 +-
 .../recipes-connectivity/galago/libgalago_0.5.2.bb |    4 +-
 .../openssl/openssl-0.9.8p/configure-targets.patch |    4 +-
 .../telepathy/telepathy-glib_0.13.6.bb             |    4 +-
 .../console-tools/console-tools_0.3.2.bb           |    3 +-
 meta/recipes-core/coreutils/coreutils_6.9.bb       |    2 +-
 meta/recipes-core/gettext/gettext_0.17.bb          |    2 +-
 meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch |  104 ++++++++++++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb      |    4 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb      |    3 +-
 meta/recipes-core/glib-2.0/glib.inc                |    2 +-
 meta/recipes-core/util-linux/util-linux.inc        |    6 +-
 .../binutils/binutils-2.21/110-arm-eabi-conf.patch |    4 +-
 .../bison/bison/uclibc-sched_param-def.patch       |   19 +++
 meta/recipes-devtools/bison/bison_2.3.bb           |    4 +-
 meta/recipes-devtools/bison/bison_2.4.3.bb         |   10 +-
 meta/recipes-devtools/diffstat/diffstat_1.54.bb    |    3 +-
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc      |    4 +-
 .../elfutils/elfutils-0.148/mempcpy.patch          |   14 ++
 meta/recipes-devtools/elfutils/elfutils_0.148.bb   |    8 +-
 meta/recipes-devtools/flex/flex.inc                |    3 +-
 .../gcc/gcc-4.3.3/110-arm-eabi.patch               |    2 +-
 meta/recipes-devtools/gcc/gcc-configure-common.inc |    2 +-
 meta/recipes-devtools/gcc/gcc-configure-sdk.inc    |    2 +-
 meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb     |    5 -
 meta/recipes-devtools/perl/perl-5.12.2/config.sh   |   14 +-
 meta/recipes-devtools/perl/perl_5.12.2.bb          |   10 ++
 .../recipes-extended/chkconfig/chkconfig_1.3.49.bb |    4 +-
 meta/recipes-extended/libuser/libuser_0.57.1.bb    |    4 +-
 meta/recipes-extended/libzypp/libzypp_git.bb       |    4 +-
 .../pam/libpam/pam-no-innetgr.patch                |   92 ++++++++++++++
 meta/recipes-extended/pam/libpam_1.1.3.bb          |    2 +
 meta/recipes-extended/sed/sed_4.1.2.bb             |    4 +-
 meta/recipes-extended/sed/sed_4.2.1.bb             |    4 +-
 meta/recipes-extended/xz/xz_5.0.0.bb               |    4 +-
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb |    4 +-
 meta/recipes-gnome/gnome/libgdata_0.7.1.bb         |    4 +-
 meta/recipes-graphics/clutter/clutter.inc          |    4 +-
 meta/recipes-graphics/xcb/libxcb.inc               |    2 +
 meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb     |    2 +-
 meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb   |    2 -
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
 meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb     |    1 -
 .../xorg-proto/bigreqsproto_1.1.1.bb               |    2 -
 meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb  |    2 -
 .../xorg-proto/xcmiscproto_1.2.1.bb                |    2 -
 .../xorg-proto/xf86bigfontproto_1.2.0.bb           |    2 -
 .../xorg-util/util-macros_1.11.0.bb                |    2 +-
 meta/recipes-kernel/linux/linux-tools.inc          |   12 ++-
 .../alsa-utils-remove-xmlto.patch                  |   18 +++
 meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb  |   12 +-
 .../gstreamer/gstreamer_0.10.31.bb                 |    4 +-
 meta/recipes-support/attr/attr.inc                 |    8 ++
 meta/recipes-support/attr/ea-acl.inc               |    4 +-
 meta/recipes-support/gnutls/gnutls.inc             |    4 +-
 meta/recipes-support/libcap/libcap.inc             |    2 +-
 meta/recipes-support/libexif/libexif_0.6.16.bb     |    3 +-
 .../libgpg-error/libgpg-error_1.9.bb               |    3 +-
 .../libiconv/libiconv-1.11.1/autoconf.patch        |   42 +++++++
 .../shared_preloadable_libiconv_linux.patch        |   16 +++
 meta/recipes-support/libiconv/libiconv_1.11.1.bb   |   30 +++++
 meta/recipes-support/libiconv/libiconv_1.9.2.bb    |   21 ----
 .../liboil-0.3.17/fix-unaligned-whitelist.patch    |   17 +++
 meta/recipes-support/liboil/liboil_0.3.17.bb       |    6 +-
 meta/recipes-support/popt/popt_1.16.bb             |    3 +-
 meta/site/mips-linux-uclibc                        |  126 ++++++++++++++++++++
 meta/site/x86_64-linux-uclibc                      |   26 ++++
 76 files changed, 657 insertions(+), 158 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
 create mode 100644 meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
 create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch
 create mode 100644 meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
 create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.23/alsa-utils-remove-xmlto.patch
 create mode 100644 meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
 create mode 100644 meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
 create mode 100644 meta/recipes-support/libiconv/libiconv_1.11.1.bb
 delete mode 100644 meta/recipes-support/libiconv/libiconv_1.9.2.bb
 create mode 100644 meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
 create mode 100644 meta/site/mips-linux-uclibc

-- 
1.7.4.1

[PATCH 01/46] sanity.bbclass: Use SSTATE_MANIFESTS instead of hard coding sstate-control

[Khem Raj]

This helps when SSTATE_MANIFESTS is overridden by external layers

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/sanity.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 639e1ea..500a1b2 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -321,7 +321,7 @@ def check_sanity(e):
             messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n"
         elif abi == "5" and current_abi == "6":
             bb.note("Converting staging layout from version 5 to layout version 6")
-            os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${TMPDIR}/sstate-control", e.data))
+            os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}", e.data))
             f = file(abifile, "w")
             f.write(current_abi)
         elif (abi != current_abi):
-- 
1.7.4.1

[PATCH 02/46] classes: Use virtual/libintl instead of gettext

[Khem Raj]

uclibc can use a proxy-libintl to provide dummy
gettext functionality so we need to make sure
we operate on virtual/libintl

gettext class is fixed so we can always use
inherit gettext to create proper dependencies
on gettext

insane class check for virtual/libintl and
error message is enhanced to print out gettext
package name it reports. Code is rearranged
for cosmetics.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/autotools.bbclass |    8 +++++++-
 meta/classes/gettext.bbclass   |    8 ++++----
 meta/classes/insane.bbclass    |   23 +++++++++++------------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index bc891f9..c128c39 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -134,7 +134,13 @@ autotools_do_configure() {
 			    echo "no" | glib-gettextize --force --copy
 			  fi
 			else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-			  cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
+			  if ! echo ${EXTRA_OECONF} | grep -q "\-\-disable-nls"; then
+			    if [ -e ${STAGING_DATADIR}/gettext/config.rpath ]; then
+			      cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
+			    else
+			      oenote config.rpath not found in target sysroot. gettext is not staged. Usually happens when building with uclibc
+			    fi
+			  fi
 			fi
 
 			fi
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index a40e74f..f49b595 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -3,15 +3,15 @@ def gettext_after_parse(d):
     if bb.data.getVar('USE_NLS', d, 1) == 'no':
         cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
         cfg += " --disable-nls"
-        depends = bb.data.getVar('DEPENDS', d, 1) or ""
-        bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d)
+        depends = bb.data.getVar('DEPENDS', d, True) or ""
+        bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl|gettext|gettext-native)$', depends, d), d)
         bb.data.setVar('EXTRA_OECONF', cfg, d)
 
 python () {
     gettext_after_parse(d)
 }
 
-DEPENDS_GETTEXT = "gettext gettext-native"
+DEPENDS_GETTEXT = "virtual/libintl gettext-native"
 
-DEPENDS =+ "${DEPENDS_GETTEXT}"
+DEPENDS_append = " ${DEPENDS_GETTEXT}"
 EXTRA_OECONF += "--enable-nls"
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 8124384..a2bcaae 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -553,10 +553,6 @@ python do_package_qa () {
     bb.note("DONE with PACKAGE QA")
 }
 
-
-# The Staging Func, to check all staging
-#addtask qa_staging after do_populate_sysroot before do_build
-do_populate_sysroot[postfuncs] += "do_qa_staging "
 python do_qa_staging() {
     bb.note("QA checking staging")
 
@@ -564,10 +560,6 @@ python do_qa_staging() {
         bb.fatal("QA staging was broken by the package built above")
 }
 
-# Check broken config.log files, for packages requiring Gettext which don't
-# have it in DEPENDS and for correct LIC_FILES_CHKSUM
-#addtask qa_configure after do_configure before do_compile
-do_configure[postfuncs] += "do_qa_configure "
 python do_qa_configure() {
     configs = []
     workdir = bb.data.getVar('WORKDIR', d, True)
@@ -585,21 +577,28 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
         if "configure.in" in files:
             configs.append(os.path.join(root, "configure.in"))
 
-    if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True):
+    cnf = bb.data.getVar('EXTRA_OECONF', d, True) or ""
+    if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True) and "--disable-nls" not in cnf:
        if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
           gt = "gettext-native"
        elif bb.data.inherits_class('cross-canadian', d):
           gt = "gettext-nativesdk"
        else:
-          gt = "gettext"
+          gt = "virtual/libintl"
        deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "")
        if gt not in deps:
           for config in configs:
               gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
               if os.system(gnu) == 0:
-                 bb.fatal("""Gettext required but not in DEPENDS for file %s.
-Missing inherit gettext?""" % config)
+                 bb.fatal("""%s required but not in DEPENDS for file %s. Missing inherit gettext?""" % (gt, config))
 
     if not package_qa_check_license(workdir, d):
         bb.fatal("Licensing Error: LIC_FILES_CHKSUM does not match, please fix")
 }
+do_populate_sysroot[postfuncs] += "do_qa_staging "
+
+# Check broken config.log files, for packages requiring Gettext which don't
+# have it in DEPENDS and for correct LIC_FILES_CHKSUM
+#addtask qa_configure after do_configure before do_compile
+
+do_configure[postfuncs] += "do_qa_configure "
-- 
1.7.4.1

[PATCH 03/46] classes: Use linux-uclibceabi instead of linux-uclibgnuceabi for os portion of triplet

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/insane.bbclass   |    2 +-
 meta/classes/siteinfo.bbclass |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index a2bcaae..fdfb659 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -75,7 +75,7 @@ def package_qa_get_machine_dict():
                         "arm" :       (40,     0,    0,          True,          32),
                         "armeb" :     (40,     0,    0,          False,         32),
                       },
-            "linux-uclibcgnueabi" : {
+            "linux-uclibceabi" : {
                         "arm" :       (40,     0,    0,          True,          32),
                         "armeb" :     (40,     0,    0,          False,         32),
                       },
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index df29097..892abc1 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -22,13 +22,13 @@ def get_siteinfo_list(d):
                "armeb-linux":             "endian-big bit-32 common-glibc arm-common",\
                "armeb-linux-gnueabi":     "endian-big bit-32 common-glibc arm-common armeb-linux",\
                "armeb-linux-uclibc":      "endian-big bit-32 common-uclibc arm-common",\
-               "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\
+               "armeb-linux-uclibceabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\
                "arm-darwin":              "endian-little bit-32 common-darwin",\
                "arm-darwin8":              "endian-little bit-32 common-darwin",\
                "arm-linux":               "endian-little bit-32 common-glibc arm-common",\
                "arm-linux-gnueabi":       "endian-little bit-32 common-glibc arm-common arm-linux",\
                "arm-linux-uclibc":        "endian-little bit-32 common-uclibc arm-common",\
-               "arm-linux-uclibcgnueabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\
+               "arm-linux-uclibceabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\
                "avr32-linux":             "endian-big bit-32 common-glibc avr32-common",\ 
                "avr32-linux-uclibc":      "endian-big bit-32 common-uclibc avr32-common",\
                "bfin-uclinux-uclibc":       "endian-little bit-32 common-uclibc bfin-common",\
-- 
1.7.4.1

[PATCH 04/46] site: Add mips-linux-uclibc site file and add to x86_64-linux-uclibc

[Khem Raj]

mips-uclibc needs the mips-linux-uclibc site file
x86_64-linux-uclibc is enahnced for missing cached variables

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/site/mips-linux-uclibc   |  126 +++++++++++++++++++++++++++++++++++++++++
 meta/site/x86_64-linux-uclibc |   26 +++++++++
 2 files changed, 152 insertions(+), 0 deletions(-)
 create mode 100644 meta/site/mips-linux-uclibc

diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc
new file mode 100644
index 0000000..074cb09
--- /dev/null
+++ b/meta/site/mips-linux-uclibc
@@ -0,0 +1,126 @@
+
+ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
+ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
+ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+
+# tslib, others
+ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
+
+# bash
+ac_cv_c_long_double=${ac_cv_c_long_double=no}
+bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
+
+# openssh
+ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
+ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
+ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
+ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=no}
+ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent=yes}
+
+# fget
+compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes}
+
+# glib
+glib_cv___va_copy=${glib_cv___va_copy=yes}
+glib_cv_has__inline=${glib_cv_has__inline=yes}
+glib_cv_has__inline__=${glib_cv_has__inline__=yes}
+glib_cv_hasinline=${glib_cv_hasinline=yes}
+glib_cv_long_long_format=${glib_cv_long_long_format=ll}
+glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no}
+glib_cv_sane_realloc=${glib_cv_sane_realloc=yes}
+glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
+glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
+glib_cv_stack_grows=${glib_cv_stack_grows=no}
+glib_cv_uscore=${glib_cv_uscore=no}
+glib_cv_va_copy=${glib_cv_va_copy=yes}
+glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
+
+# glib-2.0
+glib_cv_stack_grows=${glib_cv_stack_grows=no}
+utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
+ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
+
+# libpcap
+ac_cv_linux_vers=${ac_cv_linux_vers=2}
+ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
+
+# slrn
+slrn_cv___va_copy=${slrn_cv___va_copy=yes}
+slrn_cv_va_copy=${slrn_cv_va_copy=yes}
+slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
+
+# startup-notification
+lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
+
+# libidl
+libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
+
+# ncftp
+ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
+wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
+wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
+wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
+
+# rp-pppoe
+rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
+
+# db3
+db_cv_align_t=${db_cv_align_t='unsigned long long'}
+db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
+db_cv_mutex=${db_cv_mutex=POSIX/pthreads/library}
+db_cv_posixmutexes=${db_cv_posixmutexes=no}
+db_cv_uimutexes=${db_cv_uimutexes=no}
+db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
+db_cv_sprintf_count=${db_cv_sprintf_count=yes}
+db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
+db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
+db_cv_path_cp=${db_cv_path_cp=/bin/cp}
+db_cv_path_ln=${db_cv_path_ln=/bin/ln}
+db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
+db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
+db_cv_path_rm=${db_cv_path_rm=/bin/rm}
+db_cv_path_sh=${db_cv_path_sh=/bin/sh}
+db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
+
+# rrdtool
+rd_cv_ieee_works=${rd_cv_ieee_works=yes}
+# ac_cv_path_PERL=${ac_cv_path_PERL=no}
+
+# gettext
+am_cv_func_working_getline=${am_cv_func_working_getline=yes}
+
+# samba
+samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
+
+# vim
+ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
+
+# sudo
+sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10}
+
+# intercom
+ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
+
+# lmbench
+ac_cv_uint=${ac_cv_unit=yes}
+
+# D-BUS
+ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
+
+# mono
+cv_mono_sizeof_sunpath=108
+mono_cv_sizeof_sunpath=108
+mono_cv_uscore=${mono_cv_uscore=no}
+
+# popt
+ac_cv_va_copy=${ac_cv_va_copy=yes}
+ac_cv___va_copy=${ac_cv___va_copy=yes}
+
+# readline
+bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
+
+# eds-dbus
+ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
+
diff --git a/meta/site/x86_64-linux-uclibc b/meta/site/x86_64-linux-uclibc
index fe235d0..d83ed1d 100644
--- a/meta/site/x86_64-linux-uclibc
+++ b/meta/site/x86_64-linux-uclibc
@@ -76,3 +76,29 @@ utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
 
 # gettext
 am_cv_func_working_getline=${am_cv_func_working_getline=yes}
+
+# glib-2.0
+glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
+
+# flex
+ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
+ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
+
+# libidl
+libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
+
+# ORBit2
+ac_cv_alignof_CORBA_boolean=1
+ac_cv_alignof_CORBA_char=1
+ac_cv_alignof_CORBA_double=4
+ac_cv_alignof_CORBA_float=4
+ac_cv_alignof_CORBA_long=4
+ac_cv_alignof_CORBA_long_double=8
+ac_cv_alignof_CORBA_long_long=8
+ac_cv_alignof_CORBA_octet=1
+ac_cv_alignof_CORBA_pointer=8
+ac_cv_alignof_CORBA_short=2
+ac_cv_alignof_CORBA_struct=1
+ac_cv_alignof_CORBA_wchar=2
+ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
-- 
1.7.4.1

[PATCH 05/46] conf/distro/poky.conf: Use -uclibceabi instead of -uclibgnuceabi

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/distro/poky.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 76620f9..748e0ab 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -54,7 +54,7 @@ KERNEL_CONSOLE = "ttyS0"
 
 # Default to TARGETOS values for EABI on arm
 GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
-UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+UCLIBCTARGETOS = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
 
 POKYMODE ?= "default"
 require conf/distro/include/poky-${POKYMODE}.inc
-- 
1.7.4.1

[PATCH 06/46] recipes: Use -uclibceabi instead of -uclibcgnueabi

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../pciutils/pciutils-3.1.7/configure.patch        |    2 +-
 .../pciutils/pciutils-3.1.7/guess-fix.patch        |    2 +-
 .../openssl/openssl-0.9.8p/configure-targets.patch |    4 ++--
 .../gcc/gcc-4.3.3/110-arm-eabi.patch               |    2 +-
 meta/recipes-devtools/gcc/gcc-configure-common.inc |    2 +-
 meta/recipes-devtools/gcc/gcc-configure-sdk.inc    |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch
index 1bfe724..600af79 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch
@@ -63,7 +63,7 @@ diff -uNr pciutils-3.1.5.orig/lib/configure pciutils-3.1.5/lib/configure
 +	sys=linux
 +fi
 +
-+if [ "$host" = "linux--uclibcgnueabi" ]
++if [ "$host" = "linux--uclibceabi" ]
 +then
 +	sys=linux
 +fi
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch
index 9072d2a..f1fcb33 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch
@@ -25,7 +25,7 @@ index 4318b05..84f6acb 100755
 -	sys=linux
 -fi
 -
--if [ "$host" = "linux--uclibcgnueabi" ]
+-if [ "$host" = "linux--uclibceabi" ]
 -then
 -	sys=linux
 -fi
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch
index b68123a..6fd2769 100644
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch
@@ -14,8 +14,8 @@ Index: openssl-0.9.8g/Configure
 +"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibcgnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibcgnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +
 +"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
 +
diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch
index acebe53..74e4a5a 100644
--- a/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch
@@ -5,7 +5,7 @@
  	tmake_file="t-slibgcc-elf-ver t-linux arm/t-arm"
  	case ${target} in
 -	arm*-*-linux-gnueabi)
-+	arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
++	arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
  	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
  	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
    	    # The BPABI long long divmod functions return a 128-bit value in 
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 4393777..f7b5836 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -48,7 +48,7 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d,
 EXTRA_OECONF_append_linux               = " --enable-__cxa_atexit"
 EXTRA_OECONF_append_linux-gnueabi       = " --enable-__cxa_atexit"
 EXTRA_OECONF_append_linux-uclibc        = " --disable-__cxa_atexit"
-EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit"
+EXTRA_OECONF_append_linux-uclibceabi = " --disable-__cxa_atexit"
 EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}"
 CPPFLAGS = ""
 
diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
index 756e74e..de80870 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
@@ -2,7 +2,7 @@ require gcc-configure-common.inc
 
 # The two lines below conflict, this needs fixing - RP
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
-USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
+USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}'
 
 EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \
                       --with-gxx-include-dir=${target_includedir}/c++ \
-- 
1.7.4.1

[PATCH 07/46] libiconv: update from 1.9.2 -> 1.11.1

[Khem Raj]

1.11.1 was the last LGPLv2 release
shared_preloadable_libiconv_linux.patch is needed to make libtool 2.4
happy

Autoconf patch is similarly made to point m4 directory and update to
newer autoconf

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../libiconv/libiconv-1.11.1/autoconf.patch        |   42 ++++++++++++++++++++
 .../shared_preloadable_libiconv_linux.patch        |   16 +++++++
 meta/recipes-support/libiconv/libiconv_1.11.1.bb   |   30 ++++++++++++++
 meta/recipes-support/libiconv/libiconv_1.9.2.bb    |   21 ----------
 4 files changed, 88 insertions(+), 21 deletions(-)
 create mode 100644 meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
 create mode 100644 meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
 create mode 100644 meta/recipes-support/libiconv/libiconv_1.11.1.bb
 delete mode 100644 meta/recipes-support/libiconv/libiconv_1.9.2.bb

diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
new file mode 100644
index 0000000..377521b
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
@@ -0,0 +1,42 @@
+Index: libiconv-1.11.1/configure.ac
+===================================================================
+--- libiconv-1.11.1.orig/configure.ac
++++ libiconv-1.11.1/configure.ac
+@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR(build-aux)
+ AM_INIT_AUTOMAKE(libiconv, 1.11)
+ AC_CONFIG_HEADERS(config.h lib/config.h)
+ AC_PROG_MAKE_SET
+-
++AC_CONFIG_MACRO_DIR([m4])
+ dnl           checks for basic programs
+ 
+ AC_PROG_CC
+Index: libiconv-1.11.1/libcharset/configure.ac
+===================================================================
+--- libiconv-1.11.1.orig/libcharset/configure.ac
++++ libiconv-1.11.1/libcharset/configure.ac
+@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
+ dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
+ dnl Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+-AC_PREREQ(2.13)
++AC_PREREQ(2.61)
++AC_INIT([libcharset],[1.4] )
++AC_CONFIG_SRCDIR([lib/localcharset.c])
+ 
+-PACKAGE=libcharset
+-VERSION=1.4
+-
+-AC_INIT(lib/localcharset.c)
+ AC_CONFIG_AUX_DIR(build-aux)
+ AC_CONFIG_HEADER(config.h)
+ AC_PROG_MAKE_SET
+-AC_SUBST(PACKAGE)
+-AC_SUBST(VERSION)
++dnl AC_SUBST(PACKAGE)
++dnl AC_SUBST(VERSION)
++
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ dnl           checks for basic programs
+ 
diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
new file mode 100644
index 0000000..9f978c3
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
@@ -0,0 +1,16 @@
+Index: libiconv-1.11.1/lib/Makefile.in
+===================================================================
+--- libiconv-1.11.1.orig/lib/Makefile.in
++++ libiconv-1.11.1/lib/Makefile.in
+@@ -70,9 +70,9 @@ preloadable_libiconv.so : preloadable_li
+ 
+ preloadable_libiconv_linux.so : $(SOURCES)
+ 	if test -n "@GCC@"; then \
+-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \
+ 	else \
+-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \
+ 	fi
+ 
+ preloadable_libiconv_solaris.so : $(SOURCES)
diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb
new file mode 100644
index 0000000..28c70c8
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \
+multiple character encodings, but that support lacks from your system."
+HOMEPAGE = "http://www.gnu.org/software/libiconv"
+SECTION = "libs"
+PRIORITY = "optional"
+NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
+PROVIDES = "virtual/libiconv"
+PR = "r0"
+LICENSE = "LGPL"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
+                    file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
+           file://autoconf.patch \
+	   file://shared_preloadable_libiconv_linux.patch \
+          "
+
+SRC_URI[md5sum] = "d42b97f6ef5dd0ba4469d520ed732fed"
+SRC_URI[sha256sum] = "e78c347a1a0cb15f2648519e9799151f4b4a934b61ad9ee7424478efe2b8257f"
+
+S = "${WORKDIR}/libiconv-${PV}"
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
+
+LEAD_SONAME = "libiconv.so"
+
+do_configure_prepend () {
+	rm -f m4/libtool.m4 libcharset/m4/libtool.m4
+}
diff --git a/meta/recipes-support/libiconv/libiconv_1.9.2.bb b/meta/recipes-support/libiconv/libiconv_1.9.2.bb
deleted file mode 100644
index dac9e3c..0000000
--- a/meta/recipes-support/libiconv/libiconv_1.9.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \
-multiple character encodings, but that support lacks from your system."
-HOMEPAGE = "http://www.gnu.org/software/libiconv"
-SECTION = "libs"
-PRIORITY = "optional"
-NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
-PROVIDES = "virtual/libiconv"
-PR = "r4"
-LICENSE = "LGPL"
-SRC_URI = "${GNU_MIRROR}/libiconv/libiconv-${PV}.tar.gz"
-
-S = "${WORKDIR}/libiconv-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF += "--enable-shared --enable-static"
-
-do_configure () {
-	rm -f m4/libtool.m4 libcharset/m4/libtool.m4
-	autotools_do_configure
-}
-- 
1.7.4.1

[PATCH 08/46] avahi.inc: Conditionalize RECOMMENDS by using overrides

[Khem Raj]

libnss-mdns is not supportable on uclibc since nss is not available on
uclibc

we add gettext-dev to RRECOMMENDS only of eglibc/glibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-connectivity/avahi/avahi.inc |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 9f83d8d..6d4b830 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -16,8 +16,10 @@ PRIORITY = "optional"
 LICENSE = "GPLv2+ & LGPLv2.1+"
 
 DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
-RRECOMMENDS_${PN} = "libnss-mdns"
-RRECOMMENDS_avahi-daemon = "libnss-mdns"
+
+# uclibc has no nss
+RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
+RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
         file://00avahi-autoipd \
@@ -66,7 +68,9 @@ FILES_avahi-ui-utils = "${bindir}/bssh ${bindir}/bvnc ${bindir}/bshell \
                         ${datadir}/applications \
                         ${datadir}/avahi/interfaces"
 
-RRECOMMENDS_avahi-dev = "gettext-dev expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev"
+RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev"
+RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev"
+
 RRECOMMENDS_avahi-dev[nodeprrecs] = 1
 
 CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-- 
1.7.4.1

[PATCH 09/46] galago: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../galago/galago-daemon_0.5.1.bb                  |    4 ++--
 .../recipes-connectivity/galago/libgalago_0.5.2.bb |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb b/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
index 5d981af..01f0ef7 100644
--- a/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
+++ b/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION =   "Galago is a desktop presence framework, designed to transmit pr
 HOMEPAGE =      "http://www.galago-project.org/"
 LICENSE =       "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS =       "gettext libgalago dbus glib-2.0"
+DEPENDS =       "libgalago dbus glib-2.0"
 
 SRC_URI =       "http://www.galago-project.org/files/releases/source/${BPN}/${P}.tar.gz "
 
@@ -14,5 +14,5 @@ EXTRA_OECONF =	"--disable-binreloc --disable-check --disable-tests"
 
 FILES_${PN} += "${datadir}/dbus-1/services/"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
diff --git a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
index b1b8ce7..6d9f76b 100644
--- a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
+++ b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
@@ -5,7 +5,7 @@ LICENSE =	"LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
                     file://libgalago/galago.h;endline=21;md5=141785cb9ec62067398dda136a7bb401"
 
-DEPENDS = 	"gettext dbus glib-2.0 dbus-glib"
+DEPENDS = 	"dbus glib-2.0 dbus-glib"
 
 SRC_URI =	"http://www.galago-project.org/files/releases/source/${BPN}/${P}.tar.gz \
                  file://mkdir.patch;patch=1 \
@@ -15,6 +15,6 @@ SRC_URI[md5sum] = "7ec92f2ecba1309ac4b71b4b4d8d0a0d"
 SRC_URI[sha256sum] = "9b7c9845e2f661dbf5c2595e67bc7afd48f090ac2c033726c89d7f0e90791dfa"
 PR = "r2"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "--disable-tests --disable-check"
-- 
1.7.4.1

[PATCH 10/46] telepathy-glib_0.13.6.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../telepathy/telepathy-glib_0.13.6.bb             |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.13.6.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.13.6.bb
index 63ada04..476ed7f 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.13.6.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.13.6.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Telepathy Framework glib-base helper library"
 DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection managers"
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
-DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib gettext"
+DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
 LICENSE = "LGPLv2.1+"
 PR = "r0"
 
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "76a38a64d1b7fbaa6e1aaf6a9f8b898840c551aea5d9121bdcb35fdbb6
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 FILES_${PN} += "${datadir}/telepathy \
                 ${datadir}/dbus-1"
-- 
1.7.4.1

[PATCH 11/46] console-tools_0.3.2.bb: inherit gettext

[Khem Raj]

There is a dependency on libintl in configure

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../console-tools/console-tools_0.3.2.bb           |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index c2146e4..c7bee61 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -3,7 +3,6 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
 SUMMARY = "Allows you to set-up and manipulate the Linux console."
 DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
-DEPENDS = "gettext"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
@@ -31,7 +30,7 @@ do_compile () {
 	oe_runmake 'SUBDIRS=${SUBDIRS}'
 }
 
-inherit autotools
+inherit autotools gettext
 
 do_install () {
 	autotools_do_install
-- 
1.7.4.1

[PATCH 12/46] coreutils_6.9.bb: Remove gettext from DEPENDS

[Khem Raj]

inheriting gettext should take care of this

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/coreutils/coreutils_6.9.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index d8ea8cd..f837a22 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -9,7 +9,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://src/ls.c;startline=4;endline=16;md5=482a96d4f25010a4e13f8743e0c3685e"
 PR = "r1"
-DEPENDS = "perl-native coreutils-native-${PV} gettext "
+DEPENDS = "perl-native coreutils-native-${PV}"
 DEPENDS_virtclass-native = "perl-native gettext-native"
 
 inherit autotools gettext
-- 
1.7.4.1

[PATCH 13/46] gettext_0.17.bb: Use linux-uclibceabi instead of linux-uclibcgnueabi

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/gettext/gettext_0.17.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext_0.17.bb b/meta/recipes-core/gettext/gettext_0.17.bb
index 3a9f893..b9c4e1c 100644
--- a/meta/recipes-core/gettext/gettext_0.17.bb
+++ b/meta/recipes-core/gettext/gettext_0.17.bb
@@ -19,7 +19,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
           "
 
 SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
-SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
+SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
 
 SRC_URI[md5sum] = "58a2bc6d39c0ba57823034d55d65d606"
 SRC_URI[sha256sum] = "209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba"
-- 
1.7.4.1

[PATCH 14/46] glib-2.0: Inherit gettext should provide right libintl so remove from DEPENDS

[Khem Raj]

Add no-iconv.patch to provide dummy libiconv in case of uclibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch |  104 ++++++++++++++++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb      |    4 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb      |    3 +-
 meta/recipes-core/glib-2.0/glib.inc                |    2 +-
 4 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch b/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
new file mode 100644
index 0000000..cca57d4
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
@@ -0,0 +1,104 @@
+We provide dummy implementation of iconv functionality if it does not find
+iconv which will be case with uclibc. We remove the check for iconv in configure
+
+This is needed when libintl and libiconv is not available. It wont have any
+impact on case when they are available.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+
+Index: glib-2.26.1/glib/gconvert.c
+===================================================================
+--- glib-2.26.1.orig/glib/gconvert.c
++++ glib-2.26.1/glib/gconvert.c
+@@ -23,7 +23,7 @@
+ #include "config.h"
+ #include "glibconfig.h"
+ 
+-#ifndef G_OS_WIN32
++#if !defined G_OS_WIN32 && defined HAVE_ICONV_H
+ #include <iconv.h>
+ #endif
+ #include <errno.h>
+@@ -65,6 +65,28 @@
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
+ 
++#ifndef HAVE_ICONV_H
++typedef void *iconv_t;
++
++iconv_t iconv_open(const char *tocode, const char *fromcode)
++{
++	return (iconv_t)(-1);
++}
++
++int iconv_close(iconv_t cd)
++{
++	free(cd);
++
++	return 0;
++}
++size_t iconv (iconv_t __cd, char **__inbuf,
++                     size_t *__inbytesleft,
++                     char **__outbuf,
++                     size_t *__outbytesleft)
++{
++	return 0;
++}
++#endif
+ 
+ /**
+  * SECTION:conversions
+Index: glib-2.26.1/configure.ac
+===================================================================
+--- glib-2.26.1.orig/configure.ac
++++ glib-2.26.1/configure.ac
+@@ -373,46 +373,8 @@ dnl *** Tests for iconv ***
+ dnl ***********************
+ dnl
+ dnl We do this before the gettext checks, to avoid distortion
+-
+-dnl On Windows we use a native implementation
+-
+-if test x"$glib_native_win32" = xyes; then
+-  with_libiconv=native
+-else
+-  AC_ARG_WITH(libiconv,
+-	      [AC_HELP_STRING([--with-libiconv=@<:@no/gnu/native@:>@],
+-			      [use the libiconv library])],,
+-	      [with_libiconv=maybe])
+-
+-  found_iconv=no
+-  case $with_libiconv in
+-    maybe)
+-      # Check in the C library first
+-      AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
+-      # Check if we have GNU libiconv
+-      if test $found_iconv = "no"; then
+-	AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
+-      fi
+-      # Check if we have a iconv in -liconv, possibly from vendor
+-      if test $found_iconv = "no"; then
+-	AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
+-      fi
+-      ;;
+-    no)
+-      AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
+-      ;;
+-    gnu|yes)
+-      AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
+-      ;;
+-    native)
+-      AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
+-      ;;
+-  esac
+-
+-  if test "x$found_iconv" = "xno" ; then
+-     AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
+-  fi
+-fi
++found_iconv=yes
++with_libiconv=no
+ 
+ gl_GLIBC21
+ AC_ARG_ENABLE(iconv-cache, 
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
index 6a1fb6c..256abc1 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
@@ -1,13 +1,15 @@
 require glib.inc
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNOME_MIRROR}/glib/2.26/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch \
            file://60_wait-longer-for-threads-to-die.patch \
            file://g_once_init_enter.patch \
           "
+# Only apply this patch for target recipe on uclibc
+SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
 
 SRC_URI[md5sum] = "17535accceef55bcb17a74d73f9c2aef"
 SRC_URI[sha256sum] = "7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
index 4014a1b..8320ee9 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
@@ -1,11 +1,12 @@
 require glib.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${GNOME_MIRROR}/glib/2.27/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch \
            file://60_wait-longer-for-threads-to-die.patch \
            file://g_once_init_enter.patch \
+           file://no-iconv.patch \
           "
 
 SRC_URI[md5sum] = "b7025b581bf78fcd656117bfc113f21f"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 0319b9d..ce3203e 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -15,7 +15,7 @@ SECTION = "libs"
 
 require glib-2.0.inc
 
-DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl zip dbus"
+DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
 DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
 DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
 PACKAGES =+ "glib-2.0-utils "
-- 
1.7.4.1

[PATCH 15/46] util-linux.inc: remove virtual/libintl from DEPENDS

[Khem Raj]

inherit gettext should do it.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/util-linux/util-linux.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 913bb1b..447e5b7 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -13,10 +13,10 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9
                     file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
                     file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-DEPENDS = "zlib ncurses virtual/libintl"
-DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native"
-
 inherit autotools gettext
+DEPENDS = "zlib ncurses"
+DEPENDS_virtclass-native_append = " lzo-native"
+
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-ng-${PV}.tar.bz2 \
            file://MCONFIG \
-- 
1.7.4.1

[PATCH 16/46] binutils: Use arm*-*-linux-uclibceabi instead of arm*-*-linux-uclibcgnueabi

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../binutils/binutils-2.21/110-arm-eabi-conf.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch b/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch
index 2623301..eace3e9 100644
--- a/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch
@@ -5,7 +5,7 @@
      libgloss_dir=arm
      ;;
 -  arm*-*-linux-gnueabi)
-+  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
++  arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
      noconfigdirs="$noconfigdirs target-qthreads"
      noconfigdirs="$noconfigdirs target-libobjc"
      case ${with_newlib} in
@@ -16,7 +16,7 @@
      libgloss_dir=arm
      ;;
 -  arm*-*-linux-gnueabi)
-+  arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
++  arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
      noconfigdirs="$noconfigdirs target-qthreads"
      noconfigdirs="$noconfigdirs target-libobjc"
      case ${with_newlib} in
-- 
1.7.4.1

[PATCH 17/46] bison: Make compilable on uclibc

[Khem Raj]

Import patch from OE to fix compilation on uclibc

Let inherit gettext take care of gettext dependencies

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../bison/bison/uclibc-sched_param-def.patch       |   19 +++++++++++++++++++
 meta/recipes-devtools/bison/bison_2.3.bb           |    4 ++--
 meta/recipes-devtools/bison/bison_2.4.3.bb         |   10 ++++++----
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch

diff --git a/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch b/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
new file mode 100644
index 0000000..50652d8
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
@@ -0,0 +1,19 @@
+uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
+and is not needed too per standard. gnulib attempts to use it but we have to account
+for it because in this case uclibc does not behave like glibc.
+
+-Khem
+
+http://bugs.gentoo.org/336484
+
+--- m4-1.4.14/lib/spawn.in.h
++++ m4-1.4.14/lib/spawn.in.h
+@@ -31,7 +31,7 @@
+ 
+ /* Get definitions of 'struct sched_param' and 'sigset_t'.
+    But avoid namespace pollution on glibc systems.  */
+-#ifndef __GLIBC__
++#if !defined __GLIBC__ || defined __UCLIBC__
+ # include <sched.h>
+ # include <signal.h>
+ #endif
diff --git a/meta/recipes-devtools/bison/bison_2.3.bb b/meta/recipes-devtools/bison/bison_2.3.bb
index 08aaa6e..8d76f7b 100644
--- a/meta/recipes-devtools/bison/bison_2.3.bb
+++ b/meta/recipes-devtools/bison/bison_2.3.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 SECTION = "devel"
 PRIORITY = "optional"
-DEPENDS = "gettext bison-native"
+DEPENDS = "bison-native"
 
 PR = "r0"
 
@@ -23,7 +23,7 @@ SRC_URI[sha256sum] = "52f78aa4761a74ceb7fdf770f3554dd84308c3b93c4255e3a5c17558ec
 DEPENDS_virtclass-native = "gettext-native"
 SRC_URI_virtclass-native = "${BASE_SRC_URI}"
 
-inherit autotools
+inherit autotools gettext
 acpaths = "-I ${S}/m4"
 
 do_install_append_virtclass-native() {
diff --git a/meta/recipes-devtools/bison/bison_2.4.3.bb b/meta/recipes-devtools/bison/bison_2.4.3.bb
index fa2f154..3c164d9 100644
--- a/meta/recipes-devtools/bison/bison_2.4.3.bb
+++ b/meta/recipes-devtools/bison/bison_2.4.3.bb
@@ -8,12 +8,14 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "devel"
 PRIORITY = "optional"
-DEPENDS = "gettext bison-native"
+DEPENDS = "bison-native"
 
-PR = "r1"
+PR = "r2"
 
 BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
+	   file://m4.patch \
+	   file://uclibc-sched_param-def.patch \
+	  "
 
 SRC_URI = "${BASE_SRC_URI} \
         file://fix_cross_manpage_building.patch "
@@ -24,7 +26,7 @@ SRC_URI[sha256sum] = "6b17be5e63ff6667c83f6ef0423befe0ba23d4bc554c4c33b02ce5bb65
 DEPENDS_virtclass-native = "gettext-native"
 SRC_URI_virtclass-native = "${BASE_SRC_URI}"
 
-inherit autotools
+inherit autotools gettext
 acpaths = "-I ${S}/m4"
 
 do_install_append_virtclass-native() {
-- 
1.7.4.1

[PATCH 18/46] diffstat_1.54.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/diffstat/diffstat_1.54.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/diffstat/diffstat_1.54.bb b/meta/recipes-devtools/diffstat/diffstat_1.54.bb
index fc505f9..6eda411 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.54.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.54.bb
@@ -5,7 +5,6 @@ reviewing large, complex patch files."
 HOMEPAGE = "http://invisible-island.net/diffstat/"
 PRIORITY = "optional"
 SECTION = "devel"
-DEPENDS = "gettext"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5"
 PR = "r0"
@@ -17,7 +16,7 @@ SRC_URI[sha256sum] = "d8e67660ec85be597f8548ecdd088926639dac34ec7184aaf9d09c1e6e
 
 S = "${WORKDIR}/diffstat-${PV}"
 
-inherit autotools
+inherit autotools gettext
 
 do_configure () {
 	if [ ! -e acinclude.m4 ]; then
-- 
1.7.4.1

[PATCH 19/46] libpam_1.1.3.bb: Fix compilation on uclibc when innetgr is absent

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../pam/libpam/pam-no-innetgr.patch                |   92 ++++++++++++++++++++
 meta/recipes-extended/pam/libpam_1.1.3.bb          |    2 +
 2 files changed, 94 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/pam/libpam/pam-no-innetgr.patch

diff --git a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
new file mode 100644
index 0000000..e622a0d
--- /dev/null
+++ b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch
@@ -0,0 +1,92 @@
+innetgr may not be there so make sure that when innetgr is not present
+then we inform about it and not use it.
+
+-Khem
+Index: Linux-PAM-1.1.3/modules/pam_group/pam_group.c
+===================================================================
+--- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c
++++ Linux-PAM-1.1.3/modules/pam_group/pam_group.c
+@@ -659,7 +659,11 @@ static int check_account(pam_handle_t *p
+ 	}
+ 	/* If buffer starts with @, we are using netgroups */
+ 	if (buffer[0] == '@')
+-	  good &= innetgr (&buffer[1], NULL, user, NULL);
++#ifdef HAVE_INNETGR
++           good &= innetgr (&buffer[1], NULL, user, NULL);
++#else
++           pam_syslog (pamh, LOG_ERR, "pam_group does not have netgroup support");
++#endif
+ 	/* otherwise, if the buffer starts with %, it's a UNIX group */
+ 	else if (buffer[0] == '%')
+           good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]);
+Index: Linux-PAM-1.1.3/modules/pam_time/pam_time.c
+===================================================================
+--- Linux-PAM-1.1.3.orig/modules/pam_time/pam_time.c
++++ Linux-PAM-1.1.3/modules/pam_time/pam_time.c
+@@ -555,9 +555,13 @@ check_account(pam_handle_t *pamh, const
+ 	  }
+ 	  /* If buffer starts with @, we are using netgroups */
+ 	  if (buffer[0] == '@')
+-	    good &= innetgr (&buffer[1], NULL, user, NULL);
++#ifdef HAVE_INNETGR
++	       good &= innetgr (&buffer[1], NULL, user, NULL);
++#else
++	       pam_syslog (pamh, LOG_ERR, "pam_time does not have netgroup support");
++#endif
+ 	  else
+-	    good &= logic_field(pamh, user, buffer, count, is_same);
++	       good &= logic_field(pamh, user, buffer, count, is_same);
+ 	  D(("with user: %s", good ? "passes":"fails" ));
+ 
+ 	  /* here we get the time field */
+Index: Linux-PAM-1.1.3/modules/pam_succeed_if/pam_succeed_if.c
+===================================================================
+--- Linux-PAM-1.1.3.orig/modules/pam_succeed_if/pam_succeed_if.c
++++ Linux-PAM-1.1.3/modules/pam_succeed_if/pam_succeed_if.c
+@@ -231,18 +231,27 @@ evaluate_notingroup(pam_handle_t *pamh,
+ }
+ /* Return PAM_SUCCESS if the (host,user) is in the netgroup. */
+ static int
+-evaluate_innetgr(const char *host, const char *user, const char *group)
++evaluate_innetgr(const pam_handle_t* pamh, const char *host, const char *user, const char *group)
+ {
++#ifdef HAVE_INNETGR
+ 	if (innetgr(group, host, user, NULL) == 1)
+ 		return PAM_SUCCESS;
++#else
++        pam_syslog (pamh, LOG_ERR, "pam_succeed_if does not have netgroup support");
++#endif
++
+ 	return PAM_AUTH_ERR;
+ }
+ /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */
+ static int
+-evaluate_notinnetgr(const char *host, const char *user, const char *group)
++evaluate_notinnetgr(const pam_handle_t* pamh, const char *host, const char *user, const char *group)
+ {
++#ifdef HAVE_INNETGR
+ 	if (innetgr(group, host, user, NULL) == 0)
+ 		return PAM_SUCCESS;
++#else
++	pam_syslog (pamh, LOG_ERR, "pam_succeed_if does not have netgroup support");
++#endif
+ 	return PAM_AUTH_ERR;
+ }
+ 
+@@ -361,14 +370,14 @@ evaluate(pam_handle_t *pamh, int debug,
+ 		const void *rhost;
+ 		if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS)
+ 			rhost = NULL;
+-		return evaluate_innetgr(rhost, user, right);
++		return evaluate_innetgr(pamh, rhost, user, right);
+ 	}
+ 	/* (Rhost, user) is not in this group. */
+ 	if (strcasecmp(qual, "notinnetgr") == 0) {
+ 		const void *rhost;
+ 		if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS)
+ 			rhost = NULL;
+-		return evaluate_notinnetgr(rhost, user, right);
++		return evaluate_notinnetgr(pamh, rhost, user, right);
+ 	}
+ 	/* Fail closed. */
+ 	return PAM_SERVICE_ERR;
diff --git a/meta/recipes-extended/pam/libpam_1.1.3.bb b/meta/recipes-extended/pam/libpam_1.1.3.bb
index 9d6c317..b62e2f2 100644
--- a/meta/recipes-extended/pam/libpam_1.1.3.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.3.bb
@@ -19,6 +19,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \
            file://99_pam \
            file://pam.d/*"
 
+SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch"
+
 SRC_URI[md5sum] = "6db7fcb5db6253350e3a4648ceac40e7"
 SRC_URI[sha256sum] = "17b268789b935a76e736a1150210dd12f156972973e79347668f828d43632652"
 
-- 
1.7.4.1

[PATCH 20/46] alsa-utils_1.0.23.bb: Remove xmlto requirement

[Khem Raj]

Patch imported from OE

Use uclibceabi instead of uclibcgnueabi

inherit gettext class instead of adding gettext to DEPENDS directly

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../alsa-utils-remove-xmlto.patch                  |   18 ++++++++++++++++++
 meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb  |   12 +++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.23/alsa-utils-remove-xmlto.patch

diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/alsa-utils-remove-xmlto.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/alsa-utils-remove-xmlto.patch
new file mode 100644
index 0000000..53ff95a
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/alsa-utils-remove-xmlto.patch
@@ -0,0 +1,18 @@
+Index: alsa-utils-1.0.19/alsactl/Makefile.am
+===================================================================
+--- alsa-utils-1.0.19.orig/alsactl/Makefile.am	2009-06-24 01:08:16.000000000 -0400
++++ alsa-utils-1.0.19/alsactl/Makefile.am	2009-06-24 01:08:26.000000000 -0400
+@@ -2,13 +2,7 @@
+ 
+ sbin_PROGRAMS=alsactl
+ man_MANS=alsactl.1
+-if USE_XMLTO
+-man_MANS += alsactl_init.7
+-endif
+ EXTRA_DIST=alsactl.1 alsactl_init.xml
+ 
+ alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c
+ noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
+-
+-%.7: %.xml
+-	xmlto man $?
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb
index 46283cc..c03c61a 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb
@@ -5,11 +5,13 @@ SECTION = "console/utils"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
-DEPENDS = "alsa-lib ncurses gettext"
-PR = "r0"
+DEPENDS = "alsa-lib ncurses"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-           file://ncursesfix.patch;patch=1 "
+           file://ncursesfix.patch \
+           file://alsa-utils-remove-xmlto.patch \
+          "
 
 SRC_URI[md5sum] = "cb0cf46029ac9549cf3a31bff6a4f4e1"
 SRC_URI[sha256sum] = "b7d05e915e25f8540ad151c6dd558cf0fc1e9bb0ee23052d531c983666a1f7b0"
@@ -20,9 +22,9 @@ SRC_URI[sha256sum] = "b7d05e915e25f8540ad151c6dd558cf0fc1e9bb0ee23052d531c983666
 #
 EXTRA_OECONF = "--disable-xmlto"
 EXTRA_OECONF_linux-uclibc = "--disable-nls"
-EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
+EXTRA_OECONF_linux-uclibceabi = "--disable-nls"
 
-inherit autotools
+inherit autotools gettext
 
 # This are all packages that we need to make. Also, the now empty alsa-utils
 # ipk depend on them.
-- 
1.7.4.1

[PATCH 21/46] liboil_0.3.17.bb: Enable x86_64 unaligned memory access

[Khem Raj]

Patch imported from OE

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../liboil-0.3.17/fix-unaligned-whitelist.patch    |   17 +++++++++++++++++
 meta/recipes-support/liboil/liboil_0.3.17.bb       |    6 ++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch

diff --git a/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch b/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
new file mode 100644
index 0000000..79d53b6
--- /dev/null
+++ b/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
@@ -0,0 +1,17 @@
+Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=31358
+
+configure: fix whitelisting of x86_64 unaligned memory access
+
+Fix typo in whitelist so cross-compile works for x86_64.
+
+--- liboil-0.3.17/m4/as-unaligned-access.m4.orig	2009-02-26 14:40:08.000000000 -0500
++++ liboil-0.3.17/m4/as-unaligned-access.m4	2010-11-03 12:19:55.000000000 -0400
+@@ -9,7 +9,7 @@
+         _AS_ECHO_N([(blacklisted) ])
+         as_cv_unaligned_access=no
+ 	;;
+-      i?86*|x86_64|amd64|powerpc*|m68k*|cris*)
++      i?86*|x86_64*|amd64*|powerpc*|m68k*|cris*)
+         _AS_ECHO_N([(whitelisted) ])
+         as_cv_unaligned_access=yes
+ 	;;
diff --git a/meta/recipes-support/liboil/liboil_0.3.17.bb b/meta/recipes-support/liboil/liboil_0.3.17.bb
index fe8a22f..f342a82 100644
--- a/meta/recipes-support/liboil/liboil_0.3.17.bb
+++ b/meta/recipes-support/liboil/liboil_0.3.17.bb
@@ -10,10 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \
                     file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d"
 
 DEPENDS = "glib-2.0"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
-           file://no-tests.patch;patch=1"
+           file://no-tests.patch \
+           file://fix-unaligned-whitelist.patch \
+          "
 
 SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701"
 SRC_URI[sha256sum] = "105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
-- 
1.7.4.1

[PATCH 22/46] e2fsprogs.inc: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

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

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 1ef6340..1a1a7b8 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -18,10 +18,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b48f21d765b875bd10400975d12c1ca2 \
                       file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \
                       file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6"
 SECTION = "base"
-DEPENDS = "gettext util-linux"
+DEPENDS = "util-linux"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
            file://mkdir.patch;apply=yes"
 
-inherit autotools
+inherit autotools gettext
 
-- 
1.7.4.1

[PATCH 23/46] flex.inc: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

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

diff --git a/meta/recipes-devtools/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
index 54c400c..01f7571 100644
--- a/meta/recipes-devtools/flex/flex.inc
+++ b/meta/recipes-devtools/flex/flex.inc
@@ -5,11 +5,10 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/"
 
 SECTION = "devel"
 LICENSE = "BSD"
-DEPENDS = "gettext"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 "
 
-inherit autotools
+inherit autotools gettext
 
 do_install_append_virtclass-native() {
 	create_wrapper ${D}/${bindir}/flex M4=${STAGING_BINDIR_NATIVE}/m4
-- 
1.7.4.1

[PATCH 24/46] elfutils_0.148.bb: Fix compilation issues on uclibc

[Khem Raj]

* Add -luargp and -lintl to linker flags
* __mempcpy is not there on uclibc so define it to mempcpy

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../elfutils/elfutils-0.148/mempcpy.patch          |   14 ++++++++++++++
 meta/recipes-devtools/elfutils/elfutils_0.148.bb   |    8 +++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch

diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch
new file mode 100644
index 0000000..f4af7c4
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch
@@ -0,0 +1,14 @@
+Index: elfutils-0.148/libelf/elf_begin.c
+===================================================================
+--- elfutils-0.148.orig/libelf/elf_begin.c
++++ elfutils-0.148/libelf/elf_begin.c
+@@ -68,6 +68,9 @@
+ #include "libelfP.h"
+ #include "common.h"
+ 
++#ifdef __UCLIBC__
++#define __mempcpy mempcpy
++#endif
+ 
+ /* Create descriptor for archive in memory.  */
+ static inline Elf *
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index b2f700e..5ae4501 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3\
                     file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417"
 DEPENDS = "libtool bzip2 zlib"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2"
 
@@ -27,8 +27,8 @@ SRC_URI += "\
         file://testsuite-ignore-elflint.diff \
         file://elf_additions.diff \
 	file://elfutils-fsize.patch \
+	file://mempcpy.patch \
 "
-
 # The buildsystem wants to generate 2 .h files from source using a binary it just built,
 # which can not pass the cross compiling, so let's work around it by adding 2 .h files
 # along with the do_configure_prepend()
@@ -37,7 +37,6 @@ SRC_URI += "\
         file://i386_dis.h \
         file://x86_64_dis.h \
 "
-
 inherit autotools
 
 EXTRA_OECONF = "--program-prefix=eu-"
@@ -48,6 +47,9 @@ do_configure_prepend() {
 	cp ${WORKDIR}/*dis.h ${S}/libcpu
 }
 
+# Only append ldflags for target recipe
+TARGET_LDFLAGS_libc-uclibc += "${@['', '-lintl -luargp']['${PN}' == '${BPN}']}"
+
 BBCLASSEXTEND = "native nativesdk"
 
 # Package utilities separately
-- 
1.7.4.1

[PATCH 25/46] gcc-runtime_4.5.1.bb: Do not filter out -feliminate-dwarf2-dups

[Khem Raj]

This is already taken care by bitbake.conf

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

diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
index 9d4e158..2127eb6 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
@@ -9,8 +9,3 @@ SRC_URI_append = "file://fortran-cross-compile-hack.patch"
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions"
-
-# gcc 4.5 ends up in ICE when using -feliminate-dwarf2-dups in libstdc++
-# compiling pre compiled headers so we remove this option when compiling
-# to workaround it
-CXXFLAGS := "${@oe_filter_out('-feliminate-dwarf2-dups', '${CXXFLAGS}', d)}"
-- 
1.7.4.1

[PATCH 26/46] perl_5.12.2.bb: By defualt undefine features not found in uclibc

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/perl/perl-5.12.2/config.sh |   14 +++++++-------
 meta/recipes-devtools/perl/perl_5.12.2.bb        |   10 ++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-devtools/perl/perl-5.12.2/config.sh b/meta/recipes-devtools/perl/perl-5.12.2/config.sh
index 12d44a8..77067e1 100644
--- a/meta/recipes-devtools/perl/perl-5.12.2/config.sh
+++ b/meta/recipes-devtools/perl/perl-5.12.2/config.sh
@@ -87,7 +87,7 @@ cat='cat'
 cc='gcc'
 cccdlflags='-fPIC'
 ccdlflags='-Wl,-E -Wl,-rpath,/usr/lib/perl5/5.12.2/@ARCH@-thread-multi/CORE'
-ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='gcc'
 ccsymbols=''
@@ -108,7 +108,7 @@ cpio=''
 cpp='cpp'
 cpp_stuff='42'
 cppccsymbols=''
-cppflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector'
+cppflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe'
 cpplast='-'
 cppminus='-'
 cpprun='gcc -E'
@@ -194,7 +194,7 @@ d_dosuid='undef'
 d_drand48_r='define'
 d_drand48proto='define'
 d_dup2='define'
-d_eaccess='define'
+d_eaccess='undef'
 d_endgrent='define'
 d_endgrent_r='undef'
 d_endhent='define'
@@ -490,12 +490,12 @@ d_statfs_f_flags='undef'
 d_statfs_s='define'
 d_statvfs='define'
 d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='define'
+d_stdio_ptr_lval='undef'
 d_stdio_ptr_lval_nochange_cnt='undef'
-d_stdio_ptr_lval_sets_cnt='define'
+d_stdio_ptr_lval_sets_cnt='undef'
 d_stdio_stream_array='undef'
-d_stdiobase='define'
-d_stdstdio='define'
+d_stdiobase='undef'
+d_stdstdio='undef'
 d_strchr='define'
 d_strcoll='define'
 d_strctcpy='define'
diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb
index 184e1e7..0a6cf14 100644
--- a/meta/recipes-devtools/perl/perl_5.12.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
@@ -145,6 +145,16 @@ do_configure() {
 	       -e 's,/perl5,/perl,g' \
             config.sh-${TARGET_ARCH}-${TARGET_OS}
 
+       case "${TARGET_ARCH}" in                                                                      
+                x86_64 | powerpc | s390)                                                              
+                        sed -i -e "s,\(need_va_copy=\)'undef',\1'define',g" \                         
+                                config.sh-${TARGET_ARCH}-${TARGET_OS}                                 
+                        ;;                                                                            
+                arm)                                                                                  
+                        sed -i -e "s,\(d_u32align=\)'undef',\1'define',g" \                           
+                                config.sh-${TARGET_ARCH}-${TARGET_OS}                                 
+                        ;;                                                                            
+        esac                                                                                          
         # These are strewn all over the source tree
         for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do
             echo Fixing: $foo
-- 
1.7.4.1

[PATCH 27/46] xorg-proto: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../xorg-proto/bigreqsproto_1.1.1.bb               |    2 --
 meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb  |    2 --
 .../xorg-proto/xcmiscproto_1.2.1.bb                |    2 --
 .../xorg-proto/xf86bigfontproto_1.2.0.bb           |    2 --
 4 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.1.bb b/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.1.bb
index 19fe328..9c31a39 100644
--- a/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.1.bb
@@ -3,8 +3,6 @@ require xorg-proto-common.inc
 PR = "r0"
 PE = "1"
 
-DEPENDS += "gettext"
-
 SUMMARY = "BigReqs: X Big Requests extension headers"
 
 DESCRIPTION = "This package provides the wire protocol for the \
diff --git a/meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb b/meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb
index cd62534..f1f7cbb 100644
--- a/meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb
@@ -13,8 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7dd6ea99e2a83a552c02c80963623c38 \
 PR = "r0"
 PE = "1"
 
-DEPENDS += "gettext"
-
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI[md5sum] = "e7edb59a3f54af15f749e8f3e314ee62"
diff --git a/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.1.bb b/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.1.bb
index 1b34a5d..af5ddfd 100644
--- a/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.1.bb
@@ -12,8 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=09d83047c15994e05db29b423ed6662e"
 PR = "r0"
 PE = "1"
 
-DEPENDS += "gettext"
-
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI[md5sum] = "cd7372cd827bfd7ca7e9238f2ce274b1"
diff --git a/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
index d80c0f1..969fc91 100644
--- a/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
@@ -12,8 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
 PR = "r1"
 PE = "1"
 
-DEPENDS += "gettext"
-
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI[md5sum] = "120e226ede5a4687b25dd357cc9b8efe"
-- 
1.7.4.1

[PATCH 28/46] xorg-lib: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb     |    2 +-
 meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb   |    2 --
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
 meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb     |    1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb b/meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb
index 79078ef..c96b6e9 100644
--- a/meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb
+++ b/meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec"
 
-DEPENDS += " xproto gettext"
+DEPENDS += " xproto"
 PROVIDES = "xau"
 
 PR = "r0"
diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb
index d897dab..8ac8e38 100644
--- a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb
@@ -17,8 +17,6 @@ PROVIDES = "xdmcp"
 PR = "r0"
 PE = "1"
 
-DEPENDS += "gettext"
-
 XORG_PN = "libXdmcp"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index 4ed8c86..9b4ce1e 100644
--- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
@@ -11,6 +11,6 @@ SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "--enable-malloc0returnsnull"
diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb
index 335f020..28617ce 100644
--- a/meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb
+++ b/meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb
@@ -16,7 +16,6 @@ PE = "1"
 PR = "r0"
 
 RDEPENDS_${PN}-dev = ""
-DEPENDS += "gettext"
 
 BBCLASSEXTEND = "native nativesdk"
 
-- 
1.7.4.1

[PATCH 29/46] attr: Fix compilation on uclibc

[Khem Raj]

It needs -lintl added to LDFLAGS for uclibc

inherit gettext class instead of adding gettext to DEPENDS directly

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-support/attr/attr.inc   |    8 ++++++++
 meta/recipes-support/attr/ea-acl.inc |    4 +---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index c110340..3f64ade 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -20,3 +20,11 @@ do_install_append() {
 	sed -i ${D}${libdir}/libattr.la -e \
 	    s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
 }
+do_configure_append() {
+        # gettext hack
+        echo "#define _(str) str" >> ${S}/include/config.h
+}
+
+# Only append ldflags for target recipe
+LDFLAGS_libc-uclibc += "${@['', '-lintl']['${PN}' == '${BPN}']}"
+
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index bc93107..a09c31c 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -1,11 +1,9 @@
 # this build system is mostly shared by attr and acl
 
-DEPENDS =+ "gettext"
-
 SRC_URI += "file://relative-libdir.patch;striplevel=0 \
             file://no-fixed-prog-path.patch"
 
-inherit autotools
+inherit autotools gettext
 
 # the package comes with a custom config.h.in, it cannot be
 # overwritten by autoheader
-- 
1.7.4.1

[PATCH 30/46] sed: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/sed/sed_4.1.2.bb |    4 +---
 meta/recipes-extended/sed/sed_4.2.1.bb |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 80d4b03..89b1f34 100644
--- a/meta/recipes-extended/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
@@ -6,12 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SECTION = "console/utils"
 PR = "r5"
 
-DEPENDS = "gettext"
-
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \
            file://fix_return_type.patch"
 
-inherit autotools update-alternatives
+inherit autotools update-alternatives gettext
 
 do_install () {
 	autotools_do_install
diff --git a/meta/recipes-extended/sed/sed_4.2.1.bb b/meta/recipes-extended/sed/sed_4.2.1.bb
index 045fd66..d775d44 100644
--- a/meta/recipes-extended/sed/sed_4.2.1.bb
+++ b/meta/recipes-extended/sed/sed_4.2.1.bb
@@ -6,14 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
 SECTION = "console/utils"
 PR = "r1"
 
-DEPENDS = "gettext"
-
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "f0fd4d7da574d4707e442285fd2d3b86"
 SRC_URI[sha256sum] = "8773541ce097fdc4c5b9e7da12a82dffbb30cd91f7bc169f52f05f93b7fc3060"
 
-inherit autotools update-alternatives
+inherit autotools update-alternatives gettext
 
 do_install () {
 	autotools_do_install
-- 
1.7.4.1

[PATCH 31/46] chkconfig_1.3.49.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-extended/chkconfig/chkconfig_1.3.49.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
index 97da4a4..83adb14 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://fedorahosted.org/releases/c/h/chkconfig"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
 
-DEPENDS = "libnewt gettext popt"
+DEPENDS = "libnewt popt"
 
 PR = "r0"
 
@@ -18,7 +18,7 @@ SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${P}.tar.bz2"
 SRC_URI[md5sum] = "9b5e91d25f4f3b21f4c0bdf55a721431"
 SRC_URI[sha256sum] = "775100a9d6f70fbd8f33ed24b560b6842161fc496c21b1fc6d2aed646f9d855f"
 
-inherit autotools
+inherit autotools gettext
 
 do_install_append() {
     mkdir -p ${D}/etc/chkconfig.d
-- 
1.7.4.1

[PATCH 32/46] libuser_0.57.1.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/libuser/libuser_0.57.1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/libuser/libuser_0.57.1.bb b/meta/recipes-extended/libuser/libuser_0.57.1.bb
index 2dd3f11..355427f 100644
--- a/meta/recipes-extended/libuser/libuser_0.57.1.bb
+++ b/meta/recipes-extended/libuser/libuser_0.57.1.bb
@@ -17,8 +17,8 @@ SRC_URI[md5sum] = "be82c6941264d0b4bd04f95fb342ec7d"
 SRC_URI[sha256sum] = "a61289867581fa715354a3fafe09c3e481173ce0a2dcb33b04588b6ac13cead5"
 PR = "r1"
 
-DEPENDS = "gettext popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native"
+DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native"
 
 EXTRA_OECONF += "--without-python"
 
-inherit autotools
+inherit autotools gettext
-- 
1.7.4.1

[PATCH 33/46] libzypp_git.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/libzypp/libzypp_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index b473b9f..2e4ef7e 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -4,9 +4,9 @@ DESCRIPTION  = "The ZYpp Linux Software management framework"
 LICENSE  = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=11fccc94d26293d78cb4996cb17e5fa7"
 
-inherit cmake
+inherit cmake gettext
 
-DEPENDS  = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev"
+DEPENDS  = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
 
 # rpmdb2solv from sat-solver is run from libzypp
 RDEPENDS_${PN} = "sat-solver"
-- 
1.7.4.1

[PATCH 34/46] xz_5.0.0.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/xz/xz_5.0.0.bb |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/xz/xz_5.0.0.bb b/meta/recipes-extended/xz/xz_5.0.0.bb
index 031c92a..629ea9a 100644
--- a/meta/recipes-extended/xz/xz_5.0.0.bb
+++ b/meta/recipes-extended/xz/xz_5.0.0.bb
@@ -14,10 +14,8 @@ SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
 SRC_URI[md5sum] = "f3c0706d100ad2b6d63327584d026c50"
 SRC_URI[sha256sum] = "eba9211990a642fc2c35ea02618b710c7fa898d78ccca48b546a07bdde03c44d"
 
-DEPENDS = "gettext"
-
 PR = "r0"
 
-inherit autotools
+inherit autotools gettext
 
 BBCLASSEXTEND = "native"
-- 
1.7.4.1

[PATCH 35/46] gdk-pixbuf_2.22.1.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb
index 78f108a..211234e 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
 SECTION = "libs"
 PRIORITY = "optional"
 
-DEPENDS = "libpng gettext glib-2.0 jpeg"
+DEPENDS = "libpng glib-2.0 jpeg"
 PR = "r0"
 
 SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-${PV}.tar.gz \
@@ -20,7 +20,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-${
 SRC_URI[md5sum] = "fcfc854e9aec7dbb2bb3059484d44556"
 SRC_URI[sha256sum] = "bbb57364ffba70d64f5fcfe6eda1d67249b3d58844edb06dc0f94d1ad599b4ec"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 LIBV = "2.10.0"
 
-- 
1.7.4.1

[PATCH 36/46] libgdata_0.7.1.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-gnome/gnome/libgdata_0.7.1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gnome/libgdata_0.7.1.bb b/meta/recipes-gnome/gnome/libgdata_0.7.1.bb
index c332994..c3f4047 100644
--- a/meta/recipes-gnome/gnome/libgdata_0.7.1.bb
+++ b/meta/recipes-gnome/gnome/libgdata_0.7.1.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
                     file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \
                     file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef"
 
-DEPENDS = "gettext libxml2 glib-2.0 libsoup-2.4"
+DEPENDS = "libxml2 glib-2.0 libsoup-2.4"
 
-inherit gnome pkgconfig autotools
+inherit gnome pkgconfig autotools gettext
 
 SRC_URI[archive.md5sum] = "ec5262cbcb07b63b58d45aa3ac636096"
 SRC_URI[archive.sha256sum] = "fb244138276a5ce98510b0e2408bbf6f9ce0fd8cdcf86f07cd4be38afbb7c2bc"
-- 
1.7.4.1

[PATCH 37/46] popt_1.16.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-support/popt/popt_1.16.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb
index 4d9e518..fa6c326 100644
--- a/meta/recipes-support/popt/popt_1.16.bb
+++ b/meta/recipes-support/popt/popt_1.16.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "The popt library for parsing command line options."
 HOMEPAGE = "http://rpm5.org/"
 SECTION = "libs"
-DEPENDS = "gettext"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d"
@@ -12,6 +11,6 @@ SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz"
 SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33"
 SRC_URI[sha256sum] = "e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8"
 
-inherit autotools
+inherit autotools gettext
 
 BBCLASSEXTEND = "native"
-- 
1.7.4.1

[PATCH 38/46] libgpg-error: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../libgpg-error/libgpg-error_1.9.bb               |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.9.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.9.bb
index 479a11f..560340b 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.9.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.9.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 
 SECTION = "libs"
-DEPENDS = "gettext"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
@@ -23,4 +22,4 @@ SRC_URI[sha256sum] = "54d9326bfbd46c705963c507953f65a40576d04b374e131008dc5b732f
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir}/*"
 
-inherit autotools binconfig pkgconfig
+inherit autotools binconfig pkgconfig gettext
-- 
1.7.4.1

[PATCH 39/46] clutter.inc: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

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

diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index bdfcb91..2f9a55c 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qe
 STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
 BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
 
-DEPENDS = "${STDDEPENDS} virtual/libgl gettext"
+DEPENDS = "${STDDEPENDS} virtual/libgl"
 EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
 
 DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
@@ -45,7 +45,7 @@ PACKAGE_ARCH_menlow = "${MACHINE_ARCH}"
 
 FILESPATH = "${FILE_DIRNAME}/clutter"
 
-inherit autotools pkgconfig gtk-doc
+inherit autotools pkgconfig gtk-doc gettext
 
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require clutter-fpu.inc
-- 
1.7.4.1

[PATCH 40/46] libxcb.inc: Replace XCBPROTO_XCBPYTHONDIR to point to staging area

[Khem Raj]

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

diff --git a/meta/recipes-graphics/xcb/libxcb.inc b/meta/recipes-graphics/xcb/libxcb.inc
index 81d4a20..6c48da7 100644
--- a/meta/recipes-graphics/xcb/libxcb.inc
+++ b/meta/recipes-graphics/xcb/libxcb.inc
@@ -53,4 +53,6 @@ inherit autotools pkgconfig
 do_configure_prepend () {
     sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/|" \
         ${S}/configure.ac
+    sed -i "s|XCBPROTO_XCBPYTHONDIR=|XCBPROTO_XCBPYTHONDIR=${STAGING_DIR_HOST}/|" \
+        ${S}/configure.ac
 }
-- 
1.7.4.1

[PATCH 41/46] util-macros_1.11.0.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../xorg-util/util-macros_1.11.0.bb                |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
index e2c558c..765a577 100644
--- a/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
+++ b/meta/recipes-graphics/xorg-util/util-macros_1.11.0.bb
@@ -11,7 +11,7 @@ PE = "1"
 PR = "r0"
 
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
-DEPENDS = "gettext libgpg-error"
+DEPENDS = "libgpg-error"
 DEPENDS_virtclass-native = "gettext"
 DEPENDS_virtclass-nativesdk = "gettext"
 
-- 
1.7.4.1

[PATCH 42/46] gstreamer_0.10.31.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../gstreamer/gstreamer_0.10.31.bb                 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb
index 96c45eb..dc1d07c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
-DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native"
+DEPENDS = "glib-2.0 libxml2 bison-native flex-native"
 
 PR = "r0"
 
@@ -19,7 +19,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz
 SRC_URI[md5sum] = "a21fb08bdb578d972c7c14e77da8fbb6"
 SRC_URI[sha256sum] = "7f737e6d047c1ebeb4e1e0725fc377c5d9f12ee89186de7960be3cbba709ab84"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug"
 
-- 
1.7.4.1

[PATCH 43/46] gnutls.inc: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

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

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index a795585..2dcd8a0 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "zlib lzo gettext libtasn1 libgcrypt (>= 1.4.2)"
+DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2)"
 
 BBCLASSEXTEND = "native"
 
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"
 
-inherit autotools binconfig pkgconfig
+inherit autotools binconfig pkgconfig gettext
 
 EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
               --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
-- 
1.7.4.1

[PATCH 44/46] libcap.inc: Pass SYSTEM_HEADERS to make

[Khem Raj]

Libpcap reports faulures in finding headers

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

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 66730b8..a1c93f1 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -18,7 +18,7 @@ do_configure() {
 	sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
 }
 
-EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= lib=lib"
+EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= lib=lib SYSTEM_HEADERS=${STAGING_INCDIR}"
 EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= lib=lib"
 
 do_compile() {
-- 
1.7.4.1

[PATCH 45/46] libexif_0.6.16.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-support/libexif/libexif_0.6.16.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libexif/libexif_0.6.16.bb b/meta/recipes-support/libexif/libexif_0.6.16.bb
index 8fb15d9..d9d1c5e 100644
--- a/meta/recipes-support/libexif/libexif_0.6.16.bb
+++ b/meta/recipes-support/libexif/libexif_0.6.16.bb
@@ -3,14 +3,13 @@ HOMEPAGE = "http://sourceforge.net/projects/libexif"
 SECTION = "libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0448d3676bc0de00406af227d341a4d1"
-DEPENDS = "gettext"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "deee153b1ded5a944ea05d041d959eca"
 SRC_URI[sha256sum] = "db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43"
 
-inherit autotools
+inherit autotools gettext
 
 do_configure_append() {
 	sed -i s:doc\ binary:binary:g Makefile
-- 
1.7.4.1

[PATCH 46/46] linux-tools.inc: Dummify do_compile_perf and do_install_perf for uclibc

[Khem Raj]

Perf wants elfutils and elfutils on uclibc does not work due to
its usage of obstack_printf functionality missing from uclibc.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-kernel/linux/linux-tools.inc |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc
index 2ac74a5..9ddebed 100644
--- a/meta/recipes-kernel/linux/linux-tools.inc
+++ b/meta/recipes-kernel/linux/linux-tools.inc
@@ -1,6 +1,11 @@
 # included by kernel recipes if they want to build/provide
 # perf functionality from their tree.
-
+do_compile_perf_libc-uclibc () {
+	:
+}
+do_install_perf_libc-uclibc () {
+	:
+}
 do_compile_perf() {
 	oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix}
 }
@@ -14,6 +19,5 @@ do_install_perf() {
 addtask compile_perf after do_compile before do_install
 addtask install_perf after do_install before do_package
 
-do_compile_perf[depends] =  "virtual/libc:do_populate_sysroot"
-do_compile_perf[depends] =+ "elfutils:do_populate_sysroot"
-RDEPENDS_perf += "python perl elfutils"
+DEPENDS_perf_libc-glibc += "elfutils virtual/libc"
+RDEPENDS_perf_libc-glibc += "python perl elfutils"
-- 
1.7.4.1

Re: [PATCH 46/46] linux-tools.inc: Dummify do_compile_perf and do_install_perf for uclibc

[Khem Raj]

On Thu, Mar 31, 2011 at 9:30 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Perf wants elfutils and elfutils on uclibc does not work due to
> its usage of obstack_printf functionality missing from uclibc.
>

this patch does not work well yet but is independent of other patches
in series. This problem needs to be
sorted differently.

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-kernel/linux/linux-tools.inc |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc
> index 2ac74a5..9ddebed 100644
> --- a/meta/recipes-kernel/linux/linux-tools.inc
> +++ b/meta/recipes-kernel/linux/linux-tools.inc
> @@ -1,6 +1,11 @@
>  # included by kernel recipes if they want to build/provide
>  # perf functionality from their tree.
> -
> +do_compile_perf_libc-uclibc () {
> +       :
> +}
> +do_install_perf_libc-uclibc () {
> +       :
> +}
>  do_compile_perf() {
>        oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix}
>  }
> @@ -14,6 +19,5 @@ do_install_perf() {
>  addtask compile_perf after do_compile before do_install
>  addtask install_perf after do_install before do_package
>
> -do_compile_perf[depends] =  "virtual/libc:do_populate_sysroot"
> -do_compile_perf[depends] =+ "elfutils:do_populate_sysroot"
> -RDEPENDS_perf += "python perl elfutils"
> +DEPENDS_perf_libc-glibc += "elfutils virtual/libc"
> +RDEPENDS_perf_libc-glibc += "python perl elfutils"
> --
> 1.7.4.1
>
>

Re: [PATCH 02/46] classes: Use virtual/libintl instead of gettext

[Richard Purdie]

Hi Khem,

I have some comments about this patch.

On Thu, 2011-03-31 at 21:28 -0700, Khem Raj wrote:
> uclibc can use a proxy-libintl to provide dummy
> gettext functionality so we need to make sure
> we operate on virtual/libintl
> 
> gettext class is fixed so we can always use
> inherit gettext to create proper dependencies
> on gettext
> 
> insane class check for virtual/libintl and
> error message is enhanced to print out gettext
> package name it reports. Code is rearranged
> for cosmetics.

Can you try and split things into units of logical changes please? There
are several separate things this patch is doing and whilst I can
separate them out in my mind, it does make the patch harder to review.

In particular, some of this is a cosmetic change and those should always
be separate.

As an example of the opposite problem, sending 20 patches which change
DEPENDS = "gettext" to "inherit gettext" isn't especially useful and we
could do that as one patch.

The explanation above of "gettext class is fixed so we can always use
inherit gettext to create proper dependencies on gettext" doesn't really
explain anything about what the problem is or how its being fixed.

Instead something like:

* Change gettext.bbclass to use virtual/libintl instead of the 
  hardcoded gettext dependency
* Ensure gettext and gettext-native are removed from DEPENDS
* Use _append instead of =+ to ensure dependencies are always added 
  correctly as in some cases += will get overwritten by other overrides.

gives much more information about what is changing and why.

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/classes/autotools.bbclass |    8 +++++++-
>  meta/classes/gettext.bbclass   |    8 ++++----
>  meta/classes/insane.bbclass    |   23 +++++++++++------------
>  3 files changed, 22 insertions(+), 17 deletions(-)
> 
> diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
> index bc891f9..c128c39 100644
> --- a/meta/classes/autotools.bbclass
> +++ b/meta/classes/autotools.bbclass
> @@ -134,7 +134,13 @@ autotools_do_configure() {
>  			    echo "no" | glib-gettextize --force --copy
>  			  fi
>  			else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
> -			  cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
> +			  if ! echo ${EXTRA_OECONF} | grep -q "\-\-disable-nls"; then
> +			    if [ -e ${STAGING_DATADIR}/gettext/config.rpath ]; then
> +			      cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
> +			    else
> +			      oenote config.rpath not found in target sysroot. gettext is not staged. Usually happens when building with uclibc
> +			    fi
> +			  fi
>  			fi

This looks likely to cause errors based on my experience if the
dependencies go wrong somehow. Can we make this more explicit about the
three cases we expect (gettext/libintl/disable-nls) and what to do in
each of them. We can then still error if gettext is enabled and that
file isn't present. The error message can then be much more specific too
about what the problem is.

> diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
> index a40e74f..f49b595 100644
> --- a/meta/classes/gettext.bbclass
> +++ b/meta/classes/gettext.bbclass
> @@ -3,15 +3,15 @@ def gettext_after_parse(d):
>      if bb.data.getVar('USE_NLS', d, 1) == 'no':
>          cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
>          cfg += " --disable-nls"
> -        depends = bb.data.getVar('DEPENDS', d, 1) or ""
> -        bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d)
> +        depends = bb.data.getVar('DEPENDS', d, True) or ""
> +        bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl|gettext|gettext-native)$', depends, d), d)
>          bb.data.setVar('EXTRA_OECONF', cfg, d)
>  
>  python () {
>      gettext_after_parse(d)
>  }
>  
> -DEPENDS_GETTEXT = "gettext gettext-native"
> +DEPENDS_GETTEXT = "virtual/libintl gettext-native"

I doubt there should be be a gettext-native here in the uclibc case?

How about simplifying this to:

DEPENDS_GETTEXT = "gettext gettext-native"
DEPENDS_GETTEXT_libc-uclibc = "virtual/libintl"

> -DEPENDS =+ "${DEPENDS_GETTEXT}"
> +DEPENDS_append = " ${DEPENDS_GETTEXT}"
>  EXTRA_OECONF += "--enable-nls"
> diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
> index 8124384..a2bcaae 100644
> --- a/meta/classes/insane.bbclass
> +++ b/meta/classes/insane.bbclass
> @@ -553,10 +553,6 @@ python do_package_qa () {
>      bb.note("DONE with PACKAGE QA")
>  }
>  
> -
> -# The Staging Func, to check all staging
> -#addtask qa_staging after do_populate_sysroot before do_build
> -do_populate_sysroot[postfuncs] += "do_qa_staging "
>  python do_qa_staging() {
>      bb.note("QA checking staging")
>  
> @@ -564,10 +560,6 @@ python do_qa_staging() {
>          bb.fatal("QA staging was broken by the package built above")
>  }
>  
> -# Check broken config.log files, for packages requiring Gettext which don't
> -# have it in DEPENDS and for correct LIC_FILES_CHKSUM
> -#addtask qa_configure after do_configure before do_compile
> -do_configure[postfuncs] += "do_qa_configure "
>  python do_qa_configure() {
>      configs = []
>      workdir = bb.data.getVar('WORKDIR', d, True)
> @@ -585,21 +577,28 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
>          if "configure.in" in files:
>              configs.append(os.path.join(root, "configure.in"))
>  
> -    if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True):
> +    cnf = bb.data.getVar('EXTRA_OECONF', d, True) or ""
> +    if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True) and "--disable-nls" not in cnf:
>         if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
>            gt = "gettext-native"
>         elif bb.data.inherits_class('cross-canadian', d):
>            gt = "gettext-nativesdk"
>         else:
> -          gt = "gettext"
> +          gt = "virtual/libintl"
>         deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "")
>         if gt not in deps:
>            for config in configs:
>                gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
>                if os.system(gnu) == 0:
> -                 bb.fatal("""Gettext required but not in DEPENDS for file %s.
> -Missing inherit gettext?""" % config)
> +                 bb.fatal("""%s required but not in DEPENDS for file %s. Missing inherit gettext?""" % (gt, config))
>  
>      if not package_qa_check_license(workdir, d):
>          bb.fatal("Licensing Error: LIC_FILES_CHKSUM does not match, please fix")
>  }
> +do_populate_sysroot[postfuncs] += "do_qa_staging "
> +
> +# Check broken config.log files, for packages requiring Gettext which don't
> +# have it in DEPENDS and for correct LIC_FILES_CHKSUM
> +#addtask qa_configure after do_configure before do_compile
> +
> +do_configure[postfuncs] += "do_qa_configure "

Re: [PATCH 07/46] libiconv: update from 1.9.2 -> 1.11.1

[Richard Purdie]

On Thu, 2011-03-31 at 21:28 -0700, Khem Raj wrote:
> 1.11.1 was the last LGPLv2 release
> shared_preloadable_libiconv_linux.patch is needed to make libtool 2.4
> happy
> 
> Autoconf patch is similarly made to point m4 directory and update to
> newer autoconf

There is no header on these patches saying where the patches came from
and what they're for :(

Cheers,

Richard

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../libiconv/libiconv-1.11.1/autoconf.patch        |   42 ++++++++++++++++++++
>  .../shared_preloadable_libiconv_linux.patch        |   16 +++++++
>  meta/recipes-support/libiconv/libiconv_1.11.1.bb   |   30 ++++++++++++++
>  meta/recipes-support/libiconv/libiconv_1.9.2.bb    |   21 ----------
>  4 files changed, 88 insertions(+), 21 deletions(-)
>  create mode 100644 meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
>  create mode 100644 meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
>  create mode 100644 meta/recipes-support/libiconv/libiconv_1.11.1.bb
>  delete mode 100644 meta/recipes-support/libiconv/libiconv_1.9.2.bb
> 
> diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
> new file mode 100644
> index 0000000..377521b
> --- /dev/null
> +++ b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
> @@ -0,0 +1,42 @@
> +Index: libiconv-1.11.1/configure.ac
> +===================================================================
> +--- libiconv-1.11.1.orig/configure.ac
> ++++ libiconv-1.11.1/configure.ac
> +@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR(build-aux)
> + AM_INIT_AUTOMAKE(libiconv, 1.11)
> + AC_CONFIG_HEADERS(config.h lib/config.h)
> + AC_PROG_MAKE_SET
> +-
> ++AC_CONFIG_MACRO_DIR([m4])
> + dnl           checks for basic programs
> + 
> + AC_PROG_CC
> +Index: libiconv-1.11.1/libcharset/configure.ac
> +===================================================================
> +--- libiconv-1.11.1.orig/libcharset/configure.ac
> ++++ libiconv-1.11.1/libcharset/configure.ac
> +@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
> + dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
> + dnl Fifth Floor, Boston, MA 02110-1301, USA.
> + 
> +-AC_PREREQ(2.13)
> ++AC_PREREQ(2.61)
> ++AC_INIT([libcharset],[1.4] )
> ++AC_CONFIG_SRCDIR([lib/localcharset.c])
> + 
> +-PACKAGE=libcharset
> +-VERSION=1.4
> +-
> +-AC_INIT(lib/localcharset.c)
> + AC_CONFIG_AUX_DIR(build-aux)
> + AC_CONFIG_HEADER(config.h)
> + AC_PROG_MAKE_SET
> +-AC_SUBST(PACKAGE)
> +-AC_SUBST(VERSION)
> ++dnl AC_SUBST(PACKAGE)
> ++dnl AC_SUBST(VERSION)
> ++
> ++AC_CONFIG_MACRO_DIR([m4])
> + 
> + dnl           checks for basic programs
> + 
> diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
> new file mode 100644
> index 0000000..9f978c3
> --- /dev/null
> +++ b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
> @@ -0,0 +1,16 @@
> +Index: libiconv-1.11.1/lib/Makefile.in
> +===================================================================
> +--- libiconv-1.11.1.orig/lib/Makefile.in
> ++++ libiconv-1.11.1/lib/Makefile.in
> +@@ -70,9 +70,9 @@ preloadable_libiconv.so : preloadable_li
> + 
> + preloadable_libiconv_linux.so : $(SOURCES)
> + 	if test -n "@GCC@"; then \
> +-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
> ++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \
> + 	else \
> +-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
> ++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \
> + 	fi
> + 
> + preloadable_libiconv_solaris.so : $(SOURCES)
> diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb
> new file mode 100644
> index 0000000..28c70c8
> --- /dev/null
> +++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb
> @@ -0,0 +1,30 @@
> +DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \
> +multiple character encodings, but that support lacks from your system."
> +HOMEPAGE = "http://www.gnu.org/software/libiconv"
> +SECTION = "libs"
> +PRIORITY = "optional"
> +NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
> +PROVIDES = "virtual/libiconv"
> +PR = "r0"
> +LICENSE = "LGPL"
> +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
> +                    file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
> +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
> +           file://autoconf.patch \
> +	   file://shared_preloadable_libiconv_linux.patch \
> +          "
> +
> +SRC_URI[md5sum] = "d42b97f6ef5dd0ba4469d520ed732fed"
> +SRC_URI[sha256sum] = "e78c347a1a0cb15f2648519e9799151f4b4a934b61ad9ee7424478efe2b8257f"
> +
> +S = "${WORKDIR}/libiconv-${PV}"
> +
> +inherit autotools pkgconfig gettext
> +
> +EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
> +
> +LEAD_SONAME = "libiconv.so"
> +
> +do_configure_prepend () {
> +	rm -f m4/libtool.m4 libcharset/m4/libtool.m4
> +}
> diff --git a/meta/recipes-support/libiconv/libiconv_1.9.2.bb b/meta/recipes-support/libiconv/libiconv_1.9.2.bb
> deleted file mode 100644
> index dac9e3c..0000000
> --- a/meta/recipes-support/libiconv/libiconv_1.9.2.bb
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \
> -multiple character encodings, but that support lacks from your system."
> -HOMEPAGE = "http://www.gnu.org/software/libiconv"
> -SECTION = "libs"
> -PRIORITY = "optional"
> -NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
> -PROVIDES = "virtual/libiconv"
> -PR = "r4"
> -LICENSE = "LGPL"
> -SRC_URI = "${GNU_MIRROR}/libiconv/libiconv-${PV}.tar.gz"
> -
> -S = "${WORKDIR}/libiconv-${PV}"
> -
> -inherit autotools pkgconfig
> -
> -EXTRA_OECONF += "--enable-shared --enable-static"
> -
> -do_configure () {
> -	rm -f m4/libtool.m4 libcharset/m4/libtool.m4
> -	autotools_do_configure
> -}

Re: [PATCH 01/46] sanity.bbclass: Use SSTATE_MANIFESTS instead of hard coding sstate-control

[Richard Purdie]

On Thu, 2011-03-31 at 21:28 -0700, Khem Raj wrote:
> This helps when SSTATE_MANIFESTS is overridden by external layers
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/classes/sanity.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 639e1ea..500a1b2 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -321,7 +321,7 @@ def check_sanity(e):
>              messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n"
>          elif abi == "5" and current_abi == "6":
>              bb.note("Converting staging layout from version 5 to layout version 6")
> -            os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${TMPDIR}/sstate-control", e.data))
> +            os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}", e.data))
>              f = file(abifile, "w")
>              f.write(current_abi)
>          elif (abi != current_abi):

Merged to master, thanks.

Richard

Re: [PATCH 06/46] recipes: Use -uclibceabi instead of -uclibcgnueabi

[Richard Purdie]

On Thu, 2011-03-31 at 21:28 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../pciutils/pciutils-3.1.7/configure.patch        |    2 +-
>  .../pciutils/pciutils-3.1.7/guess-fix.patch        |    2 +-
>  .../openssl/openssl-0.9.8p/configure-targets.patch |    4 ++--
>  .../gcc/gcc-4.3.3/110-arm-eabi.patch               |    2 +-
>  meta/recipes-devtools/gcc/gcc-configure-common.inc |    2 +-
>  meta/recipes-devtools/gcc/gcc-configure-sdk.inc    |    2 +-
>  6 files changed, 7 insertions(+), 7 deletions(-)

Patches 3-6 merged to master, thanks.

Richard

Re: [PATCH 13/46] gettext_0.17.bb: Use linux-uclibceabi instead of linux-uclibcgnueabi

[Richard Purdie]

On Thu, 2011-03-31 at 21:28 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-core/gettext/gettext_0.17.bb |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-core/gettext/gettext_0.17.bb b/meta/recipes-core/gettext/gettext_0.17.bb
> index 3a9f893..b9c4e1c 100644
> --- a/meta/recipes-core/gettext/gettext_0.17.bb
> +++ b/meta/recipes-core/gettext/gettext_0.17.bb
> @@ -19,7 +19,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
>            "
>  
>  SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
> -SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
> +SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
>  
>  SRC_URI[md5sum] = "58a2bc6d39c0ba57823034d55d65d606"
>  SRC_URI[sha256sum] = "209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba"

I've merged patches 8-13 to master, thanks.

Richard

Re: [PATCH 14/46] glib-2.0: Inherit gettext should provide right libintl so remove from DEPENDS

[Richard Purdie]

On Thu, 2011-03-31 at 21:28 -0700, Khem Raj wrote:
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
> index 6a1fb6c..256abc1 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
> @@ -1,13 +1,15 @@
>  require glib.inc
>  
>  PE = "1"
> -PR = "r0"
> +PR = "r1"
>  
>  SRC_URI = "${GNOME_MIRROR}/glib/2.26/glib-${PV}.tar.bz2 \
>             file://configure-libtool.patch \
>             file://60_wait-longer-for-threads-to-die.patch \
>             file://g_once_init_enter.patch \
>            "
> +# Only apply this patch for target recipe on uclibc
> +SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
>  
>  SRC_URI[md5sum] = "17535accceef55bcb17a74d73f9c2aef"
>  SRC_URI[sha256sum] = "7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5"
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
> index 4014a1b..8320ee9 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
> @@ -1,11 +1,12 @@
>  require glib.inc
>  
> -PR = "r3"
> +PR = "r4"
>  
>  SRC_URI = "${GNOME_MIRROR}/glib/2.27/glib-${PV}.tar.bz2 \
>             file://configure-libtool.patch \
>             file://60_wait-longer-for-threads-to-die.patch \
>             file://g_once_init_enter.patch \
> +           file://no-iconv.patch \
>            "
>  
>  SRC_URI[md5sum] = "b7025b581bf78fcd656117bfc113f21f"

Why is this being done conditionally in one version and not the other?

Cheers,

Richard

Re: [PATCH 15/46] util-linux.inc: remove virtual/libintl from DEPENDS

[Richard Purdie]

On Thu, 2011-03-31 at 21:28 -0700, Khem Raj wrote:
> inherit gettext should do it.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-core/util-linux/util-linux.inc |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 913bb1b..447e5b7 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -13,10 +13,10 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9
>                      file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
>                      file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
>  
> -DEPENDS = "zlib ncurses virtual/libintl"
> -DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native"
> -
>  inherit autotools gettext
> +DEPENDS = "zlib ncurses"
> +DEPENDS_virtclass-native_append = " lzo-native"
> +
>  
>  SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-ng-${PV}.tar.bz2 \
>             file://MCONFIG \

I couldn't take this until patch 2 is cleaned up and resubmitted.

Cheers,

Richard

Re: [PATCH 19/46] libpam_1.1.3.bb: Fix compilation on uclibc when innetgr is absent

[Richard Purdie]

On Thu, 2011-03-31 at 21:29 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../pam/libpam/pam-no-innetgr.patch                |   92 ++++++++++++++++++++
>  meta/recipes-extended/pam/libpam_1.1.3.bb          |    2 +
>  2 files changed, 94 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-extended/pam/libpam/pam-no-innetgr.patch

I merged patches 16-19, thanks.

Richard

Re: [PATCH 20/46] alsa-utils_1.0.23.bb: Remove xmlto requirement

[Richard Purdie]

On Thu, 2011-03-31 at 21:29 -0700, Khem Raj wrote:
> Patch imported from OE
> 
> Use uclibceabi instead of uclibcgnueabi
> 
> inherit gettext class instead of adding gettext to DEPENDS directly
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

For OE-Core, there is a move towards generating manuals and
documentation to complete the docs package. I believe we now have a
working native xmlto binary so we don't need to disable this for OECore.

Cheers,

Richard

Re: [PATCH 28/46] xorg-lib: inherit gettext class instead of adding gettext to DEPENDS directly

[Richard Purdie]

On Thu, 2011-03-31 at 21:29 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb     |    2 +-
>  meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb   |    2 --
>  meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
>  meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb     |    1 -
>  4 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb b/meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb
> index 79078ef..c96b6e9 100644
> --- a/meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb
> +++ b/meta/recipes-graphics/xorg-lib/libxau_1.0.6.bb
> @@ -9,7 +9,7 @@ require xorg-lib-common.inc
>  LICENSE = "MIT-style"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec"
>  
> -DEPENDS += " xproto gettext"
> +DEPENDS += " xproto"
>  PROVIDES = "xau"
>  
>  PR = "r0"
> diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb
> index d897dab..8ac8e38 100644
> --- a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb
> +++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.0.bb
> @@ -17,8 +17,6 @@ PROVIDES = "xdmcp"
>  PR = "r0"
>  PE = "1"
>  
> -DEPENDS += "gettext"
> -
>  XORG_PN = "libXdmcp"
>  
>  BBCLASSEXTEND = "native nativesdk"
> diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
> index 4ed8c86..9b4ce1e 100644
> --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
> +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
> @@ -11,6 +11,6 @@ SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
>  
>  S = "${WORKDIR}/${XORG_PN}-${PV}"
>  
> -inherit autotools pkgconfig
> +inherit autotools pkgconfig gettext

NAK. Please don't add gettext dependencies to every xorg library because
three of them require it. Please add the inherits to the individual
recipes that need it. This improves parallel build performance as some
things can start compiling before gettext is built.

Cheers,

Richard

Re: [PATCH 24/46] elfutils_0.148.bb: Fix compilation issues on uclibc

[Richard Purdie]

On Thu, 2011-03-31 at 21:29 -0700, Khem Raj wrote:
> * Add -luargp and -lintl to linker flags
> * __mempcpy is not there on uclibc so define it to mempcpy
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../elfutils/elfutils-0.148/mempcpy.patch          |   14 ++++++++++++++
>  meta/recipes-devtools/elfutils/elfutils_0.148.bb   |    8 +++++---
>  2 files changed, 19 insertions(+), 3 deletions(-)
>  create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch
> 
> diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch
> new file mode 100644
> index 0000000..f4af7c4
> --- /dev/null
> +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch
> @@ -0,0 +1,14 @@
> +Index: elfutils-0.148/libelf/elf_begin.c
> +===================================================================
> +--- elfutils-0.148.orig/libelf/elf_begin.c
> ++++ elfutils-0.148/libelf/elf_begin.c
> +@@ -68,6 +68,9 @@
> + #include "libelfP.h"
> + #include "common.h"
> + 
> ++#ifdef __UCLIBC__
> ++#define __mempcpy mempcpy
> ++#endif
> + 
> + /* Create descriptor for archive in memory.  */
> + static inline Elf *

The patch description is missing...

Cheers,

Richard

Re: [PATCH 23/46] flex.inc: inherit gettext class instead of adding gettext to DEPENDS directly

[Richard Purdie]

On Thu, 2011-03-31 at 21:29 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-devtools/flex/flex.inc |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
> index 54c400c..01f7571 100644
> --- a/meta/recipes-devtools/flex/flex.inc
> +++ b/meta/recipes-devtools/flex/flex.inc
> @@ -5,11 +5,10 @@ HOMEPAGE = "http://sourceforge.net/projects/flex/"
>  
>  SECTION = "devel"
>  LICENSE = "BSD"
> -DEPENDS = "gettext"
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 "
>  
> -inherit autotools
> +inherit autotools gettext
>  
>  do_install_append_virtclass-native() {
>  	create_wrapper ${D}/${bindir}/flex M4=${STAGING_BINDIR_NATIVE}/m4

Merged 21-23, thanks.

Richard

Re: [PATCH 26/46] perl_5.12.2.bb: By defualt undefine features not found in uclibc

[Richard Purdie]

On Thu, 2011-03-31 at 21:29 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-devtools/perl/perl-5.12.2/config.sh |   14 +++++++-------
>  meta/recipes-devtools/perl/perl_5.12.2.bb        |   10 ++++++++++
>  2 files changed, 17 insertions(+), 7 deletions(-)
> 
> diff --git a/meta/recipes-devtools/perl/perl-5.12.2/config.sh b/meta/recipes-devtools/perl/perl-5.12.2/config.sh
> index 12d44a8..77067e1 100644
> --- a/meta/recipes-devtools/perl/perl-5.12.2/config.sh
> +++ b/meta/recipes-devtools/perl/perl-5.12.2/config.sh
> @@ -87,7 +87,7 @@ cat='cat'
>  cc='gcc'
>  cccdlflags='-fPIC'
>  ccdlflags='-Wl,-E -Wl,-rpath,/usr/lib/perl5/5.12.2/@ARCH@-thread-multi/CORE'
> -ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
> +ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
>  ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
>  ccname='gcc'
>  ccsymbols=''
> @@ -108,7 +108,7 @@ cpio=''
>  cpp='cpp'
>  cpp_stuff='42'
>  cppccsymbols=''
> -cppflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector'
> +cppflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe'
>  cpplast='-'
>  cppminus='-'
>  cpprun='gcc -E'

This looks like a sign that we should be putting our cc flags into here
then stack-protector is either used or not used as per the global
configuration.

> @@ -194,7 +194,7 @@ d_dosuid='undef'
>  d_drand48_r='define'
>  d_drand48proto='define'
>  d_dup2='define'
> -d_eaccess='define'
> +d_eaccess='undef'
>  d_endgrent='define'
>  d_endgrent_r='undef'
>  d_endhent='define'
> @@ -490,12 +490,12 @@ d_statfs_f_flags='undef'
>  d_statfs_s='define'
>  d_statvfs='define'
>  d_stdio_cnt_lval='undef'
> -d_stdio_ptr_lval='define'
> +d_stdio_ptr_lval='undef'
>  d_stdio_ptr_lval_nochange_cnt='undef'
> -d_stdio_ptr_lval_sets_cnt='define'
> +d_stdio_ptr_lval_sets_cnt='undef'
>  d_stdio_stream_array='undef'
> -d_stdiobase='define'
> -d_stdstdio='define'
> +d_stdiobase='undef'
> +d_stdstdio='undef'
>  d_strchr='define'
>  d_strcoll='define'
>  d_strctcpy='define'

What is the implications for a (e)glibc system of changing these?
Shouldn't these become a sed line like the target specific pieces below?

Cheers,

Richard


> diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb
> index 184e1e7..0a6cf14 100644
> --- a/meta/recipes-devtools/perl/perl_5.12.2.bb
> +++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
> @@ -145,6 +145,16 @@ do_configure() {
>  	       -e 's,/perl5,/perl,g' \
>              config.sh-${TARGET_ARCH}-${TARGET_OS}
>  
> +       case "${TARGET_ARCH}" in                                                                      
> +                x86_64 | powerpc | s390)                                                              
> +                        sed -i -e "s,\(need_va_copy=\)'undef',\1'define',g" \                         
> +                                config.sh-${TARGET_ARCH}-${TARGET_OS}                                 
> +                        ;;                                                                            
> +                arm)                                                                                  
> +                        sed -i -e "s,\(d_u32align=\)'undef',\1'define',g" \                           
> +                                config.sh-${TARGET_ARCH}-${TARGET_OS}                                 
> +                        ;;                                                                            
> +        esac                                                                                          
>          # These are strewn all over the source tree
>          for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do
>              echo Fixing: $foo

Re: [PATCH 25/46] gcc-runtime_4.5.1.bb: Do not filter out -feliminate-dwarf2-dups

[Richard Purdie]

On Thu, 2011-03-31 at 21:29 -0700, Khem Raj wrote:
> This is already taken care by bitbake.conf
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
> index 9d4e158..2127eb6 100644
> --- a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
> @@ -9,8 +9,3 @@ SRC_URI_append = "file://fortran-cross-compile-hack.patch"
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
>  
>  EXTRA_OECONF += "--disable-libunwind-exceptions"
> -
> -# gcc 4.5 ends up in ICE when using -feliminate-dwarf2-dups in libstdc++
> -# compiling pre compiled headers so we remove this option when compiling
> -# to workaround it
> -CXXFLAGS := "${@oe_filter_out('-feliminate-dwarf2-dups', '${CXXFLAGS}', d)}"

Merged, thanks.

Richard

Re: [PATCH 27/46] xorg-proto: inherit gettext class instead of adding gettext to DEPENDS directly

[Richard Purdie]

On Thu, 2011-03-31 at 21:29 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../xorg-proto/bigreqsproto_1.1.1.bb               |    2 --
>  meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb  |    2 --
>  .../xorg-proto/xcmiscproto_1.2.1.bb                |    2 --
>  .../xorg-proto/xf86bigfontproto_1.2.0.bb           |    2 --
>  4 files changed, 0 insertions(+), 8 deletions(-)

Merged, thanks.

Richard

Re: [PATCH 29/46] attr: Fix compilation on uclibc

[Richard Purdie]

On Thu, 2011-03-31 at 21:29 -0700, Khem Raj wrote:
> It needs -lintl added to LDFLAGS for uclibc
> 
> inherit gettext class instead of adding gettext to DEPENDS directly
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-support/attr/attr.inc   |    8 ++++++++
>  meta/recipes-support/attr/ea-acl.inc |    4 +---
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
> index c110340..3f64ade 100644
> --- a/meta/recipes-support/attr/attr.inc
> +++ b/meta/recipes-support/attr/attr.inc
> @@ -20,3 +20,11 @@ do_install_append() {
>  	sed -i ${D}${libdir}/libattr.la -e \
>  	    s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
>  }
> +do_configure_append() {
> +        # gettext hack
> +        echo "#define _(str) str" >> ${S}/include/config.h
> +}

No details in the commit log about what this does? It looks likely to
break (e)glibc systems? Perhaps make it libc specific to make it clear
who is using it...

> +# Only append ldflags for target recipe
> +LDFLAGS_libc-uclibc += "${@['', '-lintl']['${PN}' == '${BPN}']}"
> +
> diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
> index bc93107..a09c31c 100644
> --- a/meta/recipes-support/attr/ea-acl.inc
> +++ b/meta/recipes-support/attr/ea-acl.inc
> @@ -1,11 +1,9 @@
>  # this build system is mostly shared by attr and acl
>  
> -DEPENDS =+ "gettext"
> -
>  SRC_URI += "file://relative-libdir.patch;striplevel=0 \
>              file://no-fixed-prog-path.patch"
>  
> -inherit autotools
> +inherit autotools gettext
>  
>  # the package comes with a custom config.h.in, it cannot be
>  # overwritten by autoheader

Re: [PATCH 45/46] libexif_0.6.16.bb: inherit gettext class instead of adding gettext to DEPENDS directly

[Richard Purdie]

On Thu, 2011-03-31 at 21:30 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-support/libexif/libexif_0.6.16.bb |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-support/libexif/libexif_0.6.16.bb b/meta/recipes-support/libexif/libexif_0.6.16.bb
> index 8fb15d9..d9d1c5e 100644
> --- a/meta/recipes-support/libexif/libexif_0.6.16.bb
> +++ b/meta/recipes-support/libexif/libexif_0.6.16.bb
> @@ -3,14 +3,13 @@ HOMEPAGE = "http://sourceforge.net/projects/libexif"
>  SECTION = "libs"
>  LICENSE = "LGPLv2.1"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=0448d3676bc0de00406af227d341a4d1"
> -DEPENDS = "gettext"
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
>  
>  SRC_URI[md5sum] = "deee153b1ded5a944ea05d041d959eca"
>  SRC_URI[sha256sum] = "db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43"
>  
> -inherit autotools
> +inherit autotools gettext
>  
>  do_configure_append() {
>  	sed -i s:doc\ binary:binary:g Makefile

Patches 30-45 merged to master, thanks.

Richard

Re: [PATCH 46/46] linux-tools.inc: Dummify do_compile_perf and do_install_perf for uclibc

[Richard Purdie]

On Thu, 2011-03-31 at 21:30 -0700, Khem Raj wrote:
> Perf wants elfutils and elfutils on uclibc does not work due to
> its usage of obstack_printf functionality missing from uclibc.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-kernel/linux/linux-tools.inc |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc
> index 2ac74a5..9ddebed 100644
> --- a/meta/recipes-kernel/linux/linux-tools.inc
> +++ b/meta/recipes-kernel/linux/linux-tools.inc
> @@ -1,6 +1,11 @@
>  # included by kernel recipes if they want to build/provide
>  # perf functionality from their tree.
> -
> +do_compile_perf_libc-uclibc () {
> +	:
> +}
> +do_install_perf_libc-uclibc () {
> +	:
> +}

The do_compile/do_install lines above look good.

>  do_compile_perf() {
>  	oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix}
>  }
> @@ -14,6 +19,5 @@ do_install_perf() {
>  addtask compile_perf after do_compile before do_install
>  addtask install_perf after do_install before do_package
>  
> -do_compile_perf[depends] =  "virtual/libc:do_populate_sysroot"
> -do_compile_perf[depends] =+ "elfutils:do_populate_sysroot"
> -RDEPENDS_perf += "python perl elfutils"
> +DEPENDS_perf_libc-glibc += "elfutils virtual/libc"
> +RDEPENDS_perf_libc-glibc += "python perl elfutils"

Package overrides don't work on DEPENDS. You could however use something
like:

PERFDEPENDS = "virtual/libc:do_populate_sysroot elfutils:do_populate_sysroot"
PERFDEPENDS_libc-uclibc = ""
PERFRDEPENDS = "python perl elfutils"
PERFRDEPENDS_libc-uclibc = ""
do_compile_perf[depends] = "${PERFDEPENDS}"
RDEPENDS_perf += "${PERFRDEPENDS}"

Cheers,

Richard

Re: [PATCH 02/46] classes: Use virtual/libintl instead of gettext

[Tom Rini]

On 04/04/2011 04:43 AM, Richard Purdie wrote:
[snip]
> As an example of the opposite problem, sending 20 patches which change
> DEPENDS = "gettext" to "inherit gettext" isn't especially useful and we
> could do that as one patch.

I'd like to use this specific example (and some lessons learned doing
this in openembedded.master) as a way to say "commits are cheap, and 20
commits for 20 recipes for 20 1-liners isn't a bad thing".  If we do
this as one commit and there's a subtle bug somewhere, the bisect says
"this big list here".  And you can probably find it.  But if you do this
as 20 commits, you know where it is.  And if it's harder to fix (some of
them were) you can just revert for now and not loose all of the work you
did.

Now, separate pull request?  Certainly, and then you can just pull and
check since to me that's a lot easier for the one-liners.

-- 
Tom Rini
Mentor Graphics Corporation