diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:50:30 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:50:30 +0000 |
| commit | e49ed8da00b7a5d874fd92a806c6b036a726069c (patch) | |
| tree | 4c2986b1f377b0363e6637cc792e8e553c2b39a4 /packages/glibc/glibc_2.2.5.bb | |
| parent | 95580064683ef83263017dce9b610c74306348bb (diff) | |
| parent | a5ab4c1e92a80b977b53072b349e05ab0f097dd1 (diff) | |
merge of '6765ce1f621a9ef917ba1521afc7b81013e14dc2'
and 'fcc520f13c2e5df6e6b7d52dcbfb32cb1750c941'
Diffstat (limited to 'packages/glibc/glibc_2.2.5.bb')
| -rw-r--r-- | packages/glibc/glibc_2.2.5.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 7b5eca2432..2a3bfd26df 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r11" +PR = "r13" DEFAULT_PREFERENCE_sh3 = "-99" @@ -63,6 +63,7 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \ file://errlist-arm.patch;patch=1 \ file://glibc-2.2.5-allow-gcc-3.4-fixup.patch;patch=1 \ file://glibc-2.2.5-allow-gcc-3.4-grp.patch;patch=1 \ + file://glibc-2.2.5-allow-gcc-4.x-configure.patch;patch=1 \ file://glibc-2.2.5-alpha-pwrite64.patch;patch=1 \ file://glibc-2.2.5-arm-pwrite64.patch;patch=1 \ file://glibc-2.2.5-crosstest.patch;patch=1 \ @@ -95,6 +96,7 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \ file://threadparam.patch;patch=1 \ file://initfini-flags.patch;patch=1 \ file://pt-initfini-flags.patch;patch=1 \ + file://glibc-2.3.2-allow-solaris.patch;patch=1 \ \ file://etc/ld.so.conf \ file://generate-supported.mk" @@ -161,7 +163,7 @@ do_stage() { rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6 oe_runmake 'install_root=${STAGING_DIR_HOST}' \ 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ - '${STAGING_DIR_HOST}${layout_base_libdir}libc.so.6' \ + '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \ '${STAGING_INCDIR}/bits/errno.h' \ '${STAGING_INCDIR}/bits/libc-lock.h' \ '${STAGING_INCDIR}/gnu/stubs.h' \ @@ -199,6 +201,7 @@ require glibc-package.bbclass PACKAGES_unslung = "libc6-unslung" PACKAGE_ARCH_unslung = "nslu2" +PACKAGE_NO_GCONV_unslung = "1" RDEPENDS_libc6-unslung = "nslu2-linksys-libs" RPROVIDES_libc6-unslung = "libc6" |