summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-01-08 22:30:43 +0000
committerMike Frysinger <vapier@gentoo.org>2011-01-08 22:30:43 +0000
commit523435ed63d4304640ccc11a826f917174b1208b (patch)
tree3027bf2820c149a6e5cae65f1937b75e94aa2b1f /src/patchsets/glibc/2.9
parentRelease archival has moved to sandpiper due to exceeding available disk on pe... (diff)
downloadgentoo-523435ed63d4304640ccc11a826f917174b1208b.tar.gz
gentoo-523435ed63d4304640ccc11a826f917174b1208b.tar.bz2
gentoo-523435ed63d4304640ccc11a826f917174b1208b.zip
convert a bunch of random patches to -p1
Diffstat (limited to 'src/patchsets/glibc/2.9')
-rw-r--r--src/patchsets/glibc/2.9/0085_all_glibc-disable-ldconfig.patch4
-rw-r--r--src/patchsets/glibc/2.9/1080_all_glibc-no-inline-gmon.patch4
-rw-r--r--src/patchsets/glibc/2.9/1085_all_glibc-2.9-check_native-headers.patch4
-rw-r--r--src/patchsets/glibc/2.9/1095_all_glibc-2.9-assume-pipe2.patch8
-rw-r--r--src/patchsets/glibc/2.9/1100_all_glibc-2.3.3-china.patch4
5 files changed, 12 insertions, 12 deletions
diff --git a/src/patchsets/glibc/2.9/0085_all_glibc-disable-ldconfig.patch b/src/patchsets/glibc/2.9/0085_all_glibc-disable-ldconfig.patch
index ad46431f1a..333c1656c8 100644
--- a/src/patchsets/glibc/2.9/0085_all_glibc-disable-ldconfig.patch
+++ b/src/patchsets/glibc/2.9/0085_all_glibc-disable-ldconfig.patch
@@ -3,8 +3,8 @@ file outside of the chroot. doesnt matter anyways as we wont use the cache
results (portage will rebuild cache), so running ldconfig is simply a waste
of time.
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
@@ -117,4 +117,5 @@
install:
diff --git a/src/patchsets/glibc/2.9/1080_all_glibc-no-inline-gmon.patch b/src/patchsets/glibc/2.9/1080_all_glibc-no-inline-gmon.patch
index f099ec01a1..60262747a3 100644
--- a/src/patchsets/glibc/2.9/1080_all_glibc-no-inline-gmon.patch
+++ b/src/patchsets/glibc/2.9/1080_all_glibc-no-inline-gmon.patch
@@ -21,8 +21,8 @@ Kazu Hirata
Index: sysdeps/generic/initfini.c
===================================================================
---- sysdeps/generic/initfini.c 16 Aug 2004 04:50:53 -0000 1.9
-+++ sysdeps/generic/initfini.c 7 May 2006 15:31:08 -0000
+--- a/sysdeps/generic/initfini.c 16 Aug 2004 04:50:53 -0000 1.9
++++ b/sysdeps/generic/initfini.c 7 May 2006 15:31:08 -0000
@@ -70,7 +70,7 @@
/* The beginning of _init: */
asm (&quot;\n/*@_init_PROLOG_BEGINS*/&quot;);
diff --git a/src/patchsets/glibc/2.9/1085_all_glibc-2.9-check_native-headers.patch b/src/patchsets/glibc/2.9/1085_all_glibc-2.9-check_native-headers.patch
index 0885008d6f..bd0b302fc2 100644
--- a/src/patchsets/glibc/2.9/1085_all_glibc-2.9-check_native-headers.patch
+++ b/src/patchsets/glibc/2.9/1085_all_glibc-2.9-check_native-headers.patch
@@ -4,8 +4,8 @@ many ports hit this warning:
snipped from suse
---- sysdeps/unix/sysv/linux/check_native.c
-+++ sysdeps/unix/sysv/linux/check_native.c
+--- a/sysdeps/unix/sysv/linux/check_native.c
++++ b/sysdeps/unix/sysv/linux/check_native.c
@@ -23,6 +23,7 @@
#include <stddef.h>
#include <stdint.h>
diff --git a/src/patchsets/glibc/2.9/1095_all_glibc-2.9-assume-pipe2.patch b/src/patchsets/glibc/2.9/1095_all_glibc-2.9-assume-pipe2.patch
index 8370189df9..7390378b54 100644
--- a/src/patchsets/glibc/2.9/1095_all_glibc-2.9-assume-pipe2.patch
+++ b/src/patchsets/glibc/2.9/1095_all_glibc-2.9-assume-pipe2.patch
@@ -20,8 +20,8 @@ __have_sock_cloexec and __have_pipe2 to true. but if glibc was built against
older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
stub for it. so popen() will always fail as glibc assumes pipe2() works.
---- include/unistd.h
-+++ include/unistd.h
+--- a/include/unistd.h
++++ b/include/unistd.h
@@ -167,9 +167,6 @@
extern int __pause_nocancel (void) attribute_hidden;
@@ -33,8 +33,8 @@ stub for it. so popen() will always fail as glibc assumes pipe2() works.
+extern int __have_pipe2;
#endif
---- socket/have_sock_cloexec.c
-+++ socket/have_sock_cloexec.c
+--- a/socket/have_sock_cloexec.c
++++ b/socket/have_sock_cloexec.c
@@ -16,9 +16,14 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
diff --git a/src/patchsets/glibc/2.9/1100_all_glibc-2.3.3-china.patch b/src/patchsets/glibc/2.9/1100_all_glibc-2.3.3-china.patch
index c82f27cba1..566ad49203 100644
--- a/src/patchsets/glibc/2.9/1100_all_glibc-2.3.3-china.patch
+++ b/src/patchsets/glibc/2.9/1100_all_glibc-2.3.3-china.patch
@@ -1,5 +1,5 @@
---- localedata/locales/zh_TW
-+++ localedata/locales/zh_TW
+--- a/localedata/locales/zh_TW
++++ b/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
comment_char %
escape_char /