diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-09 21:40:16 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-09 21:40:16 +0000 |
| commit | 8aa7fe1751f4e90781b7aa1b9237ad266001bd05 (patch) | |
| tree | d7bd6b119f58d7ee7d0f01cfe9b0b28356ee50ac /packages/glibc | |
| parent | 8bca9056374e681e414f7e1adb63bc8433c161a2 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/06/09 23:39:20+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded
2005/06/09 23:36:12+02:00 dyndns.org!reenoo
kaffe:
- kaffe.inc: only add postinst/postrm for ${PN} packages.
- kaffe-gtk: add xtst to DEPENDS. fixes bug #65.
2005/06/09 22:25:09+01:00 reciva.com!pb
bash glibc_cvs around a bit
BKrev: 42a8b740h3NJEoEEPrnA1UcuXPQd9Q
Diffstat (limited to 'packages/glibc')
| -rw-r--r-- | packages/glibc/glibc_cvs.bb | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index be54e0f063..c8e8ba3735 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -6,10 +6,10 @@ PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r1" -PV = "2.3.3+cvs${CVSDATE}" +PR = "r0" +PV = "2.3.4+cvs${CVSDATE}" -GLIBC_ADDONS ?= "linuxthreads" +GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" @@ -38,15 +38,16 @@ INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 +# file://arm-no-hwcap.patch;patch=1;pnum=0 \ +# file://arm-memcpy.patch;patch=1;pnum=0 \ +# file://arm-longlong.patch;patch=1;pnum=0 \ +# file://arm-machine-gmon.patch;patch=1;pnum=0 \ +# \ +# file://arm-ioperm.patch;patch=1;pnum=0 \ +# file://ldd.patch;patch=1;pnum=0 \ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \ - file://arm-ioperm.patch;patch=1;pnum=0 \ - file://ldd.patch;patch=1;pnum=0 \ + cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \ file://fhs-linux-paths.patch;patch=1 \ - file://arm-no-hwcap.patch;patch=1;pnum=0 \ - file://arm-memcpy.patch;patch=1;pnum=0 \ - file://arm-longlong.patch;patch=1;pnum=0 \ - file://arm-machine-gmon.patch;patch=1;pnum=0 \ - \ file://etc/ld.so.conf \ file://generate-supported.mk" @@ -76,6 +77,8 @@ def get_glibc_fpu_setting(bb, d): return "" 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 @@ -93,8 +96,6 @@ rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ rusers.x spray.x nfs_prot.x rquota.x key_prot.x" do_compile () { - # this really is arm specific - touch ${S}/sysdeps/arm/framestate.c # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging unset LDFLAGS base_do_compile |