summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-14 20:20:49 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-14 20:20:49 +0100
commit8f96edfb16e593264a49b04eade98d4e2094d1b1 (patch)
tree5e3be2cff727d6fefa8080b67ec3c2beb13e99cc
parent48a278ed71306f633091ed81d170eeff45ba3759 (diff)
downloadpoky-8f96edfb16e593264a49b04eade98d4e2094d1b1.tar.gz
glibc-2.9: Sync with OE.dev and update patchset
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/glibc/glibc-2.9/glibc-2.9-use-_begin.patch28
-rw-r--r--meta/packages/glibc/glibc-2.9/nscd-init.patch39
-rw-r--r--meta/packages/glibc/glibc-2.9/rulesfix.patch13
-rw-r--r--meta/packages/glibc/glibc_2.9.bb16
4 files changed, 88 insertions, 8 deletions
diff --git a/meta/packages/glibc/glibc-2.9/glibc-2.9-use-_begin.patch b/meta/packages/glibc/glibc-2.9/glibc-2.9-use-_begin.patch
new file mode 100644
index 0000000000..8d36a0524e
--- /dev/null
+++ b/meta/packages/glibc/glibc-2.9/glibc-2.9-use-_begin.patch
@@ -0,0 +1,28 @@
1From 7c8a67320e26b8c11108bf0a3410d3aef9cf3486 Mon Sep 17 00:00:00 2001
2From: Ulrich Drepper <drepper@redhat.com>
3Date: Sat, 31 Jan 2009 00:21:15 +0000
4Subject: [PATCH] * elf/Makefile (ld.so): Adjust the sed script to insert _begin in to newer linker scripts.
5---
6diff --git a/elf/Makefile b/elf/Makefile
7index 8079fe9..e44ff1d 100644
8--- a/elf/Makefile
9+++ b/elf/Makefile
10@@ -1,4 +1,4 @@
11-# Copyright (C) 1995-2007, 2008 Free Software Foundation, Inc.
12+# Copyright (C) 1995-2007, 2008, 2009 Free Software Foundation, Inc.
13 # This file is part of the GNU C Library.
14
15 # The GNU C Library is free software; you can redistribute it and/or
16@@ -304,7 +304,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
17 $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \
18 LC_ALL=C \
19 sed -e '/^=========/,/^=========/!d;/^=========/d' \
20- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
21+ -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
22 > $@.lds
23 $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \
24 $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \
25--
261.6.3.2
27
28
diff --git a/meta/packages/glibc/glibc-2.9/nscd-init.patch b/meta/packages/glibc/glibc-2.9/nscd-init.patch
new file mode 100644
index 0000000000..884609a5a3
--- /dev/null
+++ b/meta/packages/glibc/glibc-2.9/nscd-init.patch
@@ -0,0 +1,39 @@
1--- nscd/nscd.init
2+++ nscd/nscd.init
3@@ -48,9 +48,8 @@
4
5 start () {
6 [ -d /var/run/nscd ] || mkdir /var/run/nscd
7- [ -d /var/db/nscd ] || mkdir /var/db/nscd
8 echo -n $"Starting $prog: "
9- daemon /usr/sbin/nscd
10+ /usr/sbin/nscd
11 RETVAL=$?
12 echo
13 [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
14@@ -67,12 +66,10 @@
15 # a non-privileged user
16 rm -f /var/run/nscd/nscd.pid
17 rm -f /var/run/nscd/socket
18- success $"$prog shutdown"
19- else
20- failure $"$prog shutdown"
21 fi
22- echo
23- return $RETVAL
24+ echo "Done."
25+ # If nscd did not run, return 0 according to LSB.
26+ return 0
27 }
28
29 restart() {
30@@ -104,7 +101,8 @@
31 ;;
32 force-reload | reload)
33 echo -n $"Reloading $prog: "
34- killproc /usr/sbin/nscd -HUP
35+ # Use killall, initscripts-1.0-r115 don't support -HUP yet.
36+ killall -HUP /usr/sbin/nscd
37 RETVAL=$?
38 echo
39 ;;
diff --git a/meta/packages/glibc/glibc-2.9/rulesfix.patch b/meta/packages/glibc/glibc-2.9/rulesfix.patch
new file mode 100644
index 0000000000..67bfc9467d
--- /dev/null
+++ b/meta/packages/glibc/glibc-2.9/rulesfix.patch
@@ -0,0 +1,13 @@
1Index: glibc-2.9/Makerules
2===================================================================
3--- glibc-2.9.orig/Makerules 2009-09-14 16:39:21.000000000 +0100
4+++ glibc-2.9/Makerules 2009-09-14 16:39:50.000000000 +0100
5@@ -173,6 +173,8 @@
6 # it's used in sysd-rules, below.
7 $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.awk \
8 %.sym $(common-before-compile)
9+ rm -f $(@:.h=.h.d)
10+ rm -f $(@:.h.d=.h)
11 $(AWK) -f $< $(filter %.sym,$^) \
12 | $(CC) -S -o $(@:.h.d=.h)T3 $(CFLAGS) $(CPPFLAGS) -x c - \
13 -MD -MP -MF $(@:.h=.h.d)T -MT '$(@:.h=.h.d) $(@:.h.d=.h)'
diff --git a/meta/packages/glibc/glibc_2.9.bb b/meta/packages/glibc/glibc_2.9.bb
index d56e42fdf8..24b07163e1 100644
--- a/meta/packages/glibc/glibc_2.9.bb
+++ b/meta/packages/glibc/glibc_2.9.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
5PACKAGES_DYNAMIC = "libc6*" 5PACKAGES_DYNAMIC = "libc6*"
6RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" 6RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
7 7
8PR = "r0" 8PR = "r1"
9 9
10# the -isystem in bitbake.conf screws up glibc do_stage 10# the -isystem in bitbake.conf screws up glibc do_stage
11BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 11BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
@@ -42,8 +42,9 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
42# file://arm-ioperm.patch;patch=1;pnum=0 \ 42# file://arm-ioperm.patch;patch=1;pnum=0 \
43# file://ldd.patch;patch=1;pnum=0 \ 43# file://ldd.patch;patch=1;pnum=0 \
44SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ 44SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
45 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.7.tar.bz2 \ 45 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
46 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ 46 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
47 file://nscd-init.patch;patch=1;pnum=0 \
47 file://arm-memcpy.patch;patch=1 \ 48 file://arm-memcpy.patch;patch=1 \
48 file://arm-longlong.patch;patch=1 \ 49 file://arm-longlong.patch;patch=1 \
49 file://fhs-linux-paths.patch;patch=1 \ 50 file://fhs-linux-paths.patch;patch=1 \
@@ -53,9 +54,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
53 file://glibc-check_pf.patch;patch=1;pnum=0 \ 54 file://glibc-check_pf.patch;patch=1;pnum=0 \
54 file://ldd-unbash.patch;patch=1 \ 55 file://ldd-unbash.patch;patch=1 \
55 file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \ 56 file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
56 file://local-args6.diff;patch=1 \
57 file://arm-check-pf.patch;patch=1 \
58 file://arm-lowlevellock-include-tls.patch;patch=1 \
59 file://generic-bits_select.h \ 57 file://generic-bits_select.h \
60 file://generic-bits_types.h \ 58 file://generic-bits_types.h \
61 file://generic-bits_typesizes.h \ 59 file://generic-bits_typesizes.h \
@@ -64,10 +62,10 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
64 file://generate-supported.mk \ 62 file://generate-supported.mk \
65 file://march-i686.patch;patch=1;pnum=0 \ 63 file://march-i686.patch;patch=1;pnum=0 \
66 file://tls_i486.patch;patch=1 \ 64 file://tls_i486.patch;patch=1 \
67 file://glibc-arm-no-asm-page.patch;patch=1 \ 65 file://rulesfix.patch;patch=1 \
66 file://glibc-2.9-use-_begin.patch;patch=1 \
68 " 67 "
69 68
70
71# Build fails on sh3 and sh4 without additional patches 69# Build fails on sh3 and sh4 without additional patches
72SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" 70SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
73SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" 71SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
@@ -90,7 +88,7 @@ EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
90 88
91do_munge() { 89do_munge() {
92 # Integrate ports and libidn into tree 90 # Integrate ports and libidn into tree
93 mv ${WORKDIR}/glibc-ports-2.7 ${S}/ports 91 mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports
94 mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn 92 mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn
95 93
96 # Ports isn't really working... Fix it 94 # Ports isn't really working... Fix it
@@ -124,6 +122,8 @@ addtask munge before do_patch after do_unpack
124 122
125 123
126do_configure () { 124do_configure () {
125# /var/db was not included to FHS
126 sed -i s:/var/db/nscd:/var/run/nscd: ${S}/nscd/nscd.h
127# override this function to avoid the autoconf/automake/aclocal/autoheader 127# override this function to avoid the autoconf/automake/aclocal/autoheader
128# calls for now 128# calls for now
129# don't pass CPPFLAGS into configure, since it upsets the kernel-headers 129# don't pass CPPFLAGS into configure, since it upsets the kernel-headers