summaryrefslogtreecommitdiffstats
path: root/meta/packages/glibc/files
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/packages/glibc/files
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/packages/glibc/files')
-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
2 files changed, 61 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