summaryrefslogtreecommitdiffstats
path: root/openembedded/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-01-26 11:28:45 +0000
committerRichard Purdie <richard@openedhand.com>2006-01-26 11:28:45 +0000
commit88565a78e152fe96cafaf1173ffbfb23fde07e35 (patch)
tree6e323b5c041dc386a7a7646ba5cb8e1a915c6aa4 /openembedded/packages
parenta4b1aab93cb48bef1f53f465847828fc061dd288 (diff)
downloadpoky-88565a78e152fe96cafaf1173ffbfb23fde07e35.tar.gz
glibc: Sync with OE to pull in glibc cvs workaround
git-svn-id: https://svn.o-hand.com/repos/poky@238 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages')
-rw-r--r--openembedded/packages/glibc/glibc-cvs-2.3.5/arm-no-hwcap.patch11
-rw-r--r--openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb13
2 files changed, 21 insertions, 3 deletions
diff --git a/openembedded/packages/glibc/glibc-cvs-2.3.5/arm-no-hwcap.patch b/openembedded/packages/glibc/glibc-cvs-2.3.5/arm-no-hwcap.patch
new file mode 100644
index 0000000000..d3263a7dc6
--- /dev/null
+++ b/openembedded/packages/glibc/glibc-cvs-2.3.5/arm-no-hwcap.patch
@@ -0,0 +1,11 @@
1--- libc/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h.orig 2005-12-11 14:49:51 +0100
2+++ libc/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h 2005-12-11 14:51:28 +0100
3@@ -64,7 +64,7 @@
4 HWCAP_ARM_VFP = 1 << 6,
5 HWCAP_ARM_EDSP = 1 << 7,
6
7- HWCAP_IMPORTANT = (HWCAP_ARM_HALF | HWCAP_ARM_FAST_MULT)
8+ HWCAP_IMPORTANT = HWCAP_ARM_FAST_MULT
9 };
10
11 static inline int
diff --git a/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb b/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb
index e7e5c3564b..5ee5583fc8 100644
--- a/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/openembedded/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
7 7
8FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" 8FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
9CVSDATE = "20050627" 9CVSDATE = "20050627"
10PR = "r0" 10PR = "r1"
11 11
12GLIBC_ADDONS ?= "ports,linuxthreads" 12GLIBC_ADDONS ?= "ports,linuxthreads"
13GLIBC_EXTRA_OECONF ?= "" 13GLIBC_EXTRA_OECONF ?= ""
@@ -37,8 +37,6 @@ INHIBIT_DEFAULT_DEPS = "1"
37 37
38# file://noinfo.patch;patch=1 38# file://noinfo.patch;patch=1
39# file://ldconfig.patch;patch=1;pnum=0 39# file://ldconfig.patch;patch=1;pnum=0
40# file://arm-no-hwcap.patch;patch=1;pnum=0 \
41# file://arm-memcpy.patch;patch=1;pnum=0 \
42# file://arm-machine-gmon.patch;patch=1;pnum=0 \ 40# file://arm-machine-gmon.patch;patch=1;pnum=0 \
43# \ 41# \
44# file://arm-ioperm.patch;patch=1;pnum=0 \ 42# file://arm-ioperm.patch;patch=1;pnum=0 \
@@ -47,6 +45,7 @@ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \
47 cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \ 45 cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \
48 file://arm-audit.patch;patch=1 \ 46 file://arm-audit.patch;patch=1 \
49 file://arm-audit2.patch;patch=1 \ 47 file://arm-audit2.patch;patch=1 \
48 file://arm-no-hwcap.patch;patch=1 \
50 file://arm-memcpy.patch;patch=1 \ 49 file://arm-memcpy.patch;patch=1 \
51 file://arm-longlong.patch;patch=1;pnum=0 \ 50 file://arm-longlong.patch;patch=1;pnum=0 \
52 file://fhs-linux-paths.patch;patch=1 \ 51 file://fhs-linux-paths.patch;patch=1 \
@@ -81,6 +80,14 @@ def get_glibc_fpu_setting(bb, d):
81do_munge() { 80do_munge() {
82 # Integrate ports into tree 81 # Integrate ports into tree
83 mv ${WORKDIR}/ports ${S} 82 mv ${WORKDIR}/ports ${S}
83
84 # http://www.handhelds.org/hypermail/oe/51/5135.html
85 # Some files were moved around between directories on
86 # 2005-12-21, which means that any attempt to check out
87 # from CVS using a datestamp older than that will be doomed.
88 #
89 # This is a workaround for that problem.
90 rm -rf ${S}/bits
84} 91}
85 92
86addtask munge before do_patch after do_unpack 93addtask munge before do_patch after do_unpack