summaryrefslogtreecommitdiff
path: root/packages/glibc
diff options
context:
space:
mode:
authorErik Hovland <erik@hovland.org>2006-07-26 21:22:37 +0000
committerErik Hovland <erik@hovland.org>2006-07-26 21:22:37 +0000
commit79187def07f6d015fa2affb2f3a6c964aae520e7 (patch)
treefaa9c325ac8a5a9141ba98c850bd18eade194151 /packages/glibc
parente11b1511e8ed90c91f32b056f470a952b2a52ce3 (diff)
Found out that gcc that comes with mandriva 2006.0 will barf on compiling
glibc if these two patches are not applied. These patches are backports from glibc 2.3.6.
Diffstat (limited to 'packages/glibc')
-rw-r--r--packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch11
-rw-r--r--packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch15
-rw-r--r--packages/glibc/glibc_2.3.5+cvs20050627.bb4
3 files changed, 29 insertions, 1 deletions
diff --git a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch
new file mode 100644
index 0000000000..bf2f31e479
--- /dev/null
+++ b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch
@@ -0,0 +1,11 @@
+--- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 14:38:22.208228359 -0700
++++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 14:39:56.911675066 -0700
+@@ -123,5 +123,7 @@
+ #endif
+
+ PSEUDO_END (__socket)
+-
++
++#ifndef NO_WEAK_ALIAS
+ weak_alias (__socket, socket)
++#endif
diff --git a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch
new file mode 100644
index 0000000000..0097ff94d3
--- /dev/null
+++ b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch
@@ -0,0 +1,15 @@
+--- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 13:57:05.990485563 -0700
++++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 13:58:41.197865230 -0700
+@@ -32,7 +32,11 @@
+ The .S files for the other calls just #define socket and #include this. */
+
+ #ifndef __socket
+-#define __socket P(__,socket)
++# ifndef NO_WEAK_ALIAS
++# define __socket P(__,socket)
++# else
++# define __socket socket
++# endif
+ #endif
+
+ #define PUSHARGS_1 str a1, [sp, $-4]!
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index fc5abcc266..fbab2d7afc 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
SRCDATE = "20050627"
-PR = "r7"
+PR = "r8"
GLIBC_ADDONS ?= "ports,linuxthreads"
GLIBC_EXTRA_OECONF ?= ""
@@ -55,6 +55,8 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat
file://ldsocache-varrun.patch;patch=1 \
file://5090_all_stubs-rule-fix.patch;patch=1 \
file://raise.patch;patch=1 \
+ file://glibc-2.3.3-fix-week-alias-arm.patch;patch=1 \
+ file://glibc-2.3.3-fix-week-alias-arm-2.patch;patch=1 \
file://etc/ld.so.conf \
file://generate-supported.mk"