summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 16:34:07 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 16:34:07 +0000
commit68e4dbb0ebd1a6ca420cb98ff25db7c01030624c (patch)
tree17f63f3cc76e7226c7cbe98363d7fe14f8da5864 /meta
parent4c117c12857ff176faee157b49250e0a12895de7 (diff)
downloadpoky-68e4dbb0ebd1a6ca420cb98ff25db7c01030624c.tar.gz
glibc: added 2.6.1 from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3903 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch41
-rw-r--r--meta/packages/glibc/files/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch20
-rw-r--r--meta/packages/glibc/glibc-2.4/ldd-unbash.patch11
-rw-r--r--meta/packages/glibc/glibc-2.4/local-stdio-lock.diff34
-rw-r--r--meta/packages/glibc/glibc-initial_2.6.1.bb6
-rw-r--r--meta/packages/glibc/glibc-intermediate_2.6.1.bb8
-rw-r--r--meta/packages/glibc/glibc_2.6.1.bb150
7 files changed, 270 insertions, 0 deletions
diff --git a/meta/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch b/meta/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch
new file mode 100644
index 0000000000..e137287dd1
--- /dev/null
+++ b/meta/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch
@@ -0,0 +1,41 @@
1# All lines beginning with `# DP:' are a description of the patch.
2# DP: Description: allow dynamic long-running processes to
3# DP: re-read a dynamically updated resolv.conf on the fly
4# DP: Dpatch author: Adam Conrad <adconrad@ubuntu.com>
5# DP: Patch author: Thorsten Kukuk <kukuk@suse.de>
6# DP: Upstream status: Ubuntu-Specific
7# DP: Date: 2006-01-13 08:14:21 UTC
8
9Index: resolv/res_libc.c
10===================================================================
11--- resolv/res_libc.c.orig
12+++ resolv/res_libc.c
13@@ -22,7 +22,7 @@
14 #include <arpa/nameser.h>
15 #include <resolv.h>
16 #include <bits/libc-lock.h>
17-
18+#include <sys/stat.h>
19
20 /* The following bit is copied from res_data.c (where it is #ifdef'ed
21 out) since res_init() should go into libc.so but the rest of that
22@@ -94,8 +94,17 @@
23 int
24 __res_maybe_init (res_state resp, int preinit)
25 {
26- if (resp->options & RES_INIT) {
27- if (__res_initstamp != resp->_u._ext.initstamp) {
28+ static time_t last_mtime;
29+ struct stat statbuf;
30+ int ret;
31+
32+
33+ if (resp->options & RES_INIT) {
34+ ret = stat (_PATH_RESCONF, &statbuf);
35+ if (__res_initstamp != resp->_u._ext.initstamp
36+ || (ret == 0) && (last_mtime != statbuf.st_mtime))
37+ {
38+ last_mtime = statbuf.st_mtime;
39 if (resp->nscount > 0) {
40 __res_iclose (resp, true);
41 return __res_vinit (resp, 1);
diff --git a/meta/packages/glibc/files/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch b/meta/packages/glibc/files/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch
new file mode 100644
index 0000000000..33d5282b90
--- /dev/null
+++ b/meta/packages/glibc/files/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch
@@ -0,0 +1,20 @@
1Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
2Date: 07-02-2007
3Initial Package Version: 2.6
4Origin: http://sourceware.org/ml/libc-ports/2007-05/msg00051.html
5Upstream Status: Unknown
6Description: Defines RTLD_SINGLE_THREAD_P for arm.
7
8diff -Naur glibc-2.6.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h glibc-2.6/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
9--- glibc-2.6.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-07-02 17:39:22.000000000 -0400
10+++ glibc-2.6/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-07-02 17:39:36.000000000 -0400
11@@ -126,3 +126,9 @@
12 # define NO_CANCELLATION 1
13
14 #endif
15+
16+#ifndef __ASSEMBLER__
17+# define RTLD_SINGLE_THREAD_P \
18+ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
19+ header.multiple_threads) == 0, 1)
20+#endif
diff --git a/meta/packages/glibc/glibc-2.4/ldd-unbash.patch b/meta/packages/glibc/glibc-2.4/ldd-unbash.patch
new file mode 100644
index 0000000000..2fb8854b49
--- /dev/null
+++ b/meta/packages/glibc/glibc-2.4/ldd-unbash.patch
@@ -0,0 +1,11 @@
1--- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000
2+++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000
3@@ -110,7 +110,7 @@
4 # environments where the executed program might not have permissions
5 # to write to the console/tty. But only bash 3.x supports the pipefail
6 # option, and we don't bother to handle the case for older bash versions.
7-if set -o pipefail 2> /dev/null; then
8+if false; then
9 try_trace() {
10 eval $add_env '"$@"' | cat
11 }
diff --git a/meta/packages/glibc/glibc-2.4/local-stdio-lock.diff b/meta/packages/glibc/glibc-2.4/local-stdio-lock.diff
new file mode 100644
index 0000000000..65cd2fd6b4
--- /dev/null
+++ b/meta/packages/glibc/glibc-2.4/local-stdio-lock.diff
@@ -0,0 +1,34 @@
1---
2 bits/stdio-lock.h | 17 +++++++++++++----
3 1 file changed, 13 insertions(+), 4 deletions(-)
4
5--- glibc-2.7.orig/bits/stdio-lock.h
6+++ glibc-2.7/bits/stdio-lock.h
7@@ -45,14 +45,23 @@ __libc_lock_define_recursive (typedef, _
8 #define _IO_cleanup_region_end(_doit) \
9 __libc_cleanup_region_end (_doit)
10
11 #if defined _LIBC && !defined NOT_IN_libc
12 # define _IO_acquire_lock(_fp) \
13- _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \
14- _IO_flockfile (_fp)
15+ { \
16+ _IO_FILE *_IO_acquire_lock_file = _fp; \
17+ __libc_cleanup_region_start (1, (void (*) (void *)) _IO_acquire_lock_fct, &_IO_acquire_lock_file); \
18+ _IO_flockfile (_IO_acquire_lock_file)
19+
20+# define _IO_acquire_lock_clear_flags2(_fp) \
21+ { \
22+ _IO_FILE *_IO_acquire_lock_file = _fp; \
23+ __libc_cleanup_region_start (1, (void (*) (void *)) _IO_acquire_lock_clear_flags2_fct, &_IO_acquire_lock_file); \
24+ _IO_flockfile (_IO_acquire_lock_file)
25
26 # define _IO_release_lock(_fp) \
27- _IO_funlockfile (_fp); \
28- _IO_cleanup_region_end (0)
29+ __libc_cleanup_region_end (1); \
30+ }
31+
32 #endif
33
34 #endif /* bits/stdio-lock.h */
diff --git a/meta/packages/glibc/glibc-initial_2.6.1.bb b/meta/packages/glibc/glibc-initial_2.6.1.bb
new file mode 100644
index 0000000000..3ad96569f5
--- /dev/null
+++ b/meta/packages/glibc/glibc-initial_2.6.1.bb
@@ -0,0 +1,6 @@
1require glibc_${PV}.bb
2require glibc-initial.inc
3
4do_configure_prepend () {
5 unset CFLAGS
6} \ No newline at end of file
diff --git a/meta/packages/glibc/glibc-intermediate_2.6.1.bb b/meta/packages/glibc/glibc-intermediate_2.6.1.bb
new file mode 100644
index 0000000000..05d6250783
--- /dev/null
+++ b/meta/packages/glibc/glibc-intermediate_2.6.1.bb
@@ -0,0 +1,8 @@
1require glibc_${PV}.bb
2require glibc-intermediate.inc
3
4# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
5do_configure_prepend() {
6 sed -i s:-Werror:: ${S}/configure
7}
8
diff --git a/meta/packages/glibc/glibc_2.6.1.bb b/meta/packages/glibc/glibc_2.6.1.bb
new file mode 100644
index 0000000000..4c59bbdc13
--- /dev/null
+++ b/meta/packages/glibc/glibc_2.6.1.bb
@@ -0,0 +1,150 @@
1require glibc.inc
2PR = "r3"
3
4ARM_INSTRUCTION_SET = "arm"
5
6PACKAGES_DYNAMIC = "libc6*"
7RPROVIDES_${PN}-dev = "libc6-dev"
8
9# the -isystem in bitbake.conf screws up glibc do_stage
10BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
11TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
12
13
14FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
15
16GLIBC_ADDONS ?= "ports,nptl,libidn"
17
18GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
19
20#
21# For now, we will skip building of a gcc package if it is a uclibc one
22# and our build is not a uclibc one, and we skip a glibc one if our build
23# is a uclibc build.
24#
25# See the note in gcc/gcc_3.4.0.oe
26#
27
28python __anonymous () {
29 import bb, re
30 uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
31 if uc_os:
32 raise bb.parse.SkipPackage("incompatible with target %s" %
33 bb.data.getVar('TARGET_OS', d, 1))
34}
35
36RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
37
38SRC_URI = "\
39 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
40 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
41 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \
42 file://arm-memcpy.patch;patch=1 \
43 file://arm-longlong.patch;patch=1 \
44 file://fhs-linux-paths.patch;patch=1 \
45 file://dl-cache-libcmp.patch;patch=1 \
46 file://ldsocache-varrun.patch;patch=1 \
47 file://nptl-crosscompile.patch;patch=1 \
48 file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
49 file://glibc-check_pf.patch;patch=1;pnum=0 \
50 file://zecke-sane-readelf.patch;patch=1 \
51 file://ldd-unbash.patch;patch=1 \
52 file://generic-bits_select.h \
53 file://generic-bits_types.h \
54 file://generic-bits_typesizes.h \
55 file://generic-bits_time.h \
56 file://etc/ld.so.conf \
57 file://generate-supported.mk \
58 file://glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch;patch=1 \
59"
60
61# Build fails on sh3 and sh4 without additional patches
62SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
63SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
64
65# PowerPC Patches to add support for soft-float
66SRC_URI_append_powerpc = "file://powerpc-sqrt-hack.diff;patch=1"
67
68S = "${WORKDIR}/glibc-${PV}"
69B = "${WORKDIR}/build-${TARGET_SYS}"
70
71EXTRA_OECONF = "\
72 --enable-kernel=${OLDEST_KERNEL} \
73 --without-cvs --disable-profile --disable-debug --without-gd \
74 --enable-clocale=gnu \
75 --enable-add-ons=${GLIBC_ADDONS} \
76 --with-headers=${STAGING_INCDIR} \
77 --without-selinux \
78 ${GLIBC_EXTRA_OECONF} \
79"
80
81EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
82
83do_munge() {
84 # Integrate ports and libidn into tree
85 mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports
86 mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn
87
88 # Ports isn't really working... Fix it
89 # Some of this is rather dirty, but it seems to be the only
90 # quick way to get this cruft to compile
91 rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
92 ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
93 cp ${S}/nptl/sysdeps/pthread/bits/sigthread.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
94 cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
95 cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
96 cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h
97 cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h
98 cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h
99 cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h
100 # Copy in generic stuff for not yet implemented headers
101 for i in ${S}/bits/*.h; do
102 F=`basename $i`
103 [ "$F" = "local_lim.h" ] && continue
104 [ "$F" = "errno.h" ] && continue
105 test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
106 done
107 # This is harmful; we need to get the one from nptl/sysdeps/pthreads
108 rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h
109 # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h
110 rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h
111 # Obsoleted by sysdeps/gnu/bits/utmp.h
112 rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h
113}
114
115addtask munge before do_patch after do_unpack
116
117
118do_configure () {
119# override this function to avoid the autoconf/automake/aclocal/autoheader
120# calls for now
121# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
122# version check and doesn't really help with anything
123 if [ -z "`which rpcgen`" ]; then
124 echo "rpcgen not found. Install glibc-devel."
125 exit 1
126 fi
127 (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
128 CPPFLAGS="" oe_runconf
129}
130
131rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
132 yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
133 rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
134
135do_compile () {
136 # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
137 unset LDFLAGS
138 base_do_compile
139 (
140 cd ${S}/sunrpc/rpcsvc
141 for r in ${rpcsvc}; do
142 h=`echo $r|sed -e's,\.x$,.h,'`
143 rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
144 done
145 )
146}
147
148require glibc-stage.inc
149
150require glibc-package.bbclass