From e46b2474872492e0e92d6bb43d6d1bda33057c06 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Dec 2006 11:56:07 +0000 Subject: glibc 2.5: Sync with OE.dev git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1061 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/glibc/glibc_2.5.bb | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'meta/packages/glibc/glibc_2.5.bb') diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb index 0afadadb60..d3c6ab02ec 100644 --- a/meta/packages/glibc/glibc_2.5.bb +++ b/meta/packages/glibc/glibc_2.5.bb @@ -1,9 +1,6 @@ -DESCRIPTION = "GNU C Library" -HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "required" -PR = "r2" +require glibc.inc + +PR = "r4" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" @@ -55,6 +52,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ file://dl-cache-libcmp.patch;patch=1 \ file://ldsocache-varrun.patch;patch=1 \ file://nptl-crosscompile.patch;patch=1 \ + file://glibc-check_pf.patch;patch=1;pnum=0 \ # file://glibc-2.4-compile.patch;patch=1 \ # file://glibc-2.4-openat-3.patch;patch=1 \ # file://fixup-aeabi-syscalls.patch;patch=1 \ @@ -71,6 +69,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" +SRC_URI_append_powerpc = " file://powerpc-sqrt-hack.diff;patch=1" + S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" @@ -86,11 +86,6 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" -def get_glibc_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return "--without-fp" - return "" - do_munge() { # Integrate ports and libidn into tree mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports -- cgit v1.2.3-54-g00ecf