1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.3.6/250-weakalias.patch Mon Oct 13 20:36:37 2008 +0000
1.3 @@ -0,0 +1,45 @@
1.4 +This one was taken from debian.
1.5 +
1.6 +# DP: Description: Fix __bind redefinition problem
1.7 +# DP: Related bugs:
1.8 +# DP: Dpatch author: Phil Blundell
1.9 +# DP: Patch author: Daniel Jacobowitz
1.10 +# DP: Upstream status: In CVS
1.11 +# DP: Status Details:
1.12 +# DP: Date: 2005-12-25
1.13 +
1.14 +Index: sysdeps/unix/sysv/linux/arm/socket.S
1.15 +===================================================================
1.16 +RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/arm/socket.S,v
1.17 +retrieving revision 1.12
1.18 +retrieving revision 1.13
1.19 +diff -u -r1.12 -r1.13
1.20 +--- glibc-2.3.6.ds1.orig/sysdeps/unix/sysv/linux/arm/socket.S 4 Dec 2004 21:20:16 -0000 1.12
1.21 ++++ glibc-2.3.6.ds1/sysdeps/unix/sysv/linux/arm/socket.S 27 Oct 2005 18:50:12 -0000 1.13
1.22 +@@ -1,4 +1,6 @@
1.23 +-/* Copyright (C) 1995, 1996, 1997, 1998, 2003 Free Software Foundation, Inc.
1.24 ++/* Copyright (C) 1995, 1996, 1997, 1998, 2003, 2004, 2005
1.25 ++ Free Software Foundation, Inc.
1.26 ++
1.27 + This file is part of the GNU C Library.
1.28 +
1.29 + The GNU C Library is free software; you can redistribute it and/or
1.30 +@@ -32,7 +34,11 @@
1.31 + The .S files for the other calls just #define socket and #include this. */
1.32 +
1.33 + #ifndef __socket
1.34 ++#ifndef NO_WEAK_ALIAS
1.35 + #define __socket P(__,socket)
1.36 ++#else
1.37 ++#define __socket socket
1.38 ++#endif
1.39 + #endif
1.40 +
1.41 + #define PUSHARGS_1 str a1, [sp, $-4]!
1.42 +@@ -120,4 +126,6 @@
1.43 +
1.44 + PSEUDO_END (__socket)
1.45 +
1.46 ++#ifndef NO_WEAK_ALIAS
1.47 + weak_alias (__socket, socket)
1.48 ++#endif