diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-11 10:40:11 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-11 10:40:11 +0000 |
| commit | 2ef4306d4da7e73d8efd48e7458316673a7e4bc3 (patch) | |
| tree | 270d474452745a530c8778f2c93dd2ff37c4596c /packages/glibc/glibc_cvs.bb | |
| parent | e409e3ad41ac3f5e43b1c1e0ac36b54a5c0b6c3b (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/06/11 11:28:51+01:00 reciva.com!pb
fix up glibc HEAD build
2005/06/11 10:59:25+01:00 reciva.com!pb
add qemu, a generic and open source processor emulator
BKrev: 42aabf8bWUGkFwRKNJxluuXBcki6mQ
Diffstat (limited to 'packages/glibc/glibc_cvs.bb')
| -rw-r--r-- | packages/glibc/glibc_cvs.bb | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index c8e8ba3735..3eec2f67b6 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -5,9 +5,9 @@ SECTION = "libs" PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" PR = "r0" -PV = "2.3.4+cvs${CVSDATE}" +PV = "2.3.5+cvs${CVSDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -47,12 +47,15 @@ INHIBIT_DEFAULT_DEPS = "1" # file://ldd.patch;patch=1;pnum=0 \ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \ cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \ + file://arm-audit.patch;patch=1 \ + file://arm-audit2.patch;patch=1 \ + file://arm-memcpy.patch;patch=1 \ file://fhs-linux-paths.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" # seems to fail on tls platforms -SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1" +#SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1" SRC_URI_append_ramses = " file://ldsocache-varrun.patch;patch=1" @@ -76,9 +79,14 @@ def get_glibc_fpu_setting(bb, d): return "--without-fp" return "" +do_munge() { + # Integrate ports into tree + mv ${WORKDIR}/ports ${S} +} + +addtask munge before do_patch after do_unpack + do_configure () { -# Integrate ports into tree - if [ ! -d ${S}/ports ]; then mv ${WORKDIR}/ports ${S}; fi # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now # don't pass CPPFLAGS into configure, since it upsets the kernel-headers |