diff options
author | Robert Schuster <thebohemian@gmx.net> | 2008-07-26 20:07:54 +0000 |
---|---|---|
committer | Robert Schuster <thebohemian@gmx.net> | 2008-07-26 20:07:54 +0000 |
commit | f42b906bc4359d4a18b51fefa3423716c0af30a8 (patch) | |
tree | e55f7294941844761601fffa104ab9e51321e16d /packages/glibc/glibc-2.3.6/glibc-arm-socket-weakalias.patch | |
parent | 38c0392e6849f181119aef9b231e97c64a77e1d4 (diff) | |
parent | 7cff782b984312bb9d3226d9e44cb2b9a9401a81 (diff) |
merge of '3f2ba26557bb371913a11a48aa9bcb4f58fd6fe5'
and '4a6eea520cb0bded1313d57689af2993701d4e87'
Diffstat (limited to 'packages/glibc/glibc-2.3.6/glibc-arm-socket-weakalias.patch')
-rw-r--r-- | packages/glibc/glibc-2.3.6/glibc-arm-socket-weakalias.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/packages/glibc/glibc-2.3.6/glibc-arm-socket-weakalias.patch b/packages/glibc/glibc-2.3.6/glibc-arm-socket-weakalias.patch new file mode 100644 index 0000000000..722365f122 --- /dev/null +++ b/packages/glibc/glibc-2.3.6/glibc-arm-socket-weakalias.patch @@ -0,0 +1,45 @@ +This one was taken from debian. + +# DP: Description: Fix __bind redefinition problem +# DP: Related bugs: +# DP: Dpatch author: Phil Blundell +# DP: Patch author: Daniel Jacobowitz +# DP: Upstream status: In CVS +# DP: Status Details: +# DP: Date: 2005-12-25 + +Index: sysdeps/unix/sysv/linux/arm/socket.S +=================================================================== +RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/arm/socket.S,v +retrieving revision 1.12 +retrieving revision 1.13 +diff -u -r1.12 -r1.13 +--- glibc-2.3.6.ds1.orig/sysdeps/unix/sysv/linux/arm/socket.S 4 Dec 2004 21:20:16 -0000 1.12 ++++ glibc-2.3.6.ds1/sysdeps/unix/sysv/linux/arm/socket.S 27 Oct 2005 18:50:12 -0000 1.13 +@@ -1,4 +1,6 @@ +-/* Copyright (C) 1995, 1996, 1997, 1998, 2003 Free Software Foundation, Inc. ++/* Copyright (C) 1995, 1996, 1997, 1998, 2003, 2004, 2005 ++ Free Software Foundation, Inc. ++ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -32,7 +34,11 @@ + The .S files for the other calls just #define socket and #include this. */ + + #ifndef __socket ++#ifndef NO_WEAK_ALIAS + #define __socket P(__,socket) ++#else ++#define __socket socket ++#endif + #endif + + #define PUSHARGS_1 str a1, [sp, $-4]! +@@ -120,4 +126,6 @@ + + PSEUDO_END (__socket) + ++#ifndef NO_WEAK_ALIAS + weak_alias (__socket, socket) ++#endif |