Author: schizo Date: 2005-12-17 15:14:53 +0000 (Sat, 17 Dec 2005) New Revision: 1063
Added: glibc-package/trunk/debian/patches/powerpc-socket-weakalias.dpatch Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/00list Log: * Add patch from Anton Blanchard to fix build failure with __bind and other socket-related symbols being already defined on powerpc. (Closes: #343571). Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2005-12-17 14:43:10 UTC (rev 1062) +++ glibc-package/trunk/debian/changelog 2005-12-17 15:14:53 UTC (rev 1063) @@ -6,6 +6,9 @@ * Add patch to fix build failure with __bind and other socket-related symbols being already defined on sparc. (Closes: #342755). + * Add patch from Anton Blanchard to fix build failure with + __bind and other socket-related symbols being already + defined on powerpc. (Closes: #343571). [ Daniel Jacobowitz ] * Downgrade priority of amd64 libraries on i386. Modified: glibc-package/trunk/debian/patches/00list =================================================================== --- glibc-package/trunk/debian/patches/00list 2005-12-17 14:43:10 UTC (rev 1062) +++ glibc-package/trunk/debian/patches/00list 2005-12-17 15:14:53 UTC (rev 1063) @@ -91,3 +91,4 @@ hppa-fenv-align eh-frame-terminator sparc-socket-weakalias +powerpc-socket-weakalias Added: glibc-package/trunk/debian/patches/powerpc-socket-weakalias.dpatch =================================================================== --- glibc-package/trunk/debian/patches/powerpc-socket-weakalias.dpatch 2005-12-17 14:43:10 UTC (rev 1062) +++ glibc-package/trunk/debian/patches/powerpc-socket-weakalias.dpatch 2005-12-17 15:14:53 UTC (rev 1063) @@ -0,0 +1,87 @@ +#! /bin/sh -e + +# All lines beginning with `# DP:' are a description of the patch. +# DP: Description: Fix __bind redefinition and lround problems +# DP: Related bugs: +# DP: Dpatch author: Clint Adams +# DP: Patch author: Anton Blanchard +# DP: Upstream status: Not Submitted +# DP: Status Details: +# DP: Date: 2005-12-16 + +PATCHLEVEL=0 + +if [ $# -ne 2 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;; + -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# append the patch here and adjust the -p? flag in the patch calls. + +--- sysdeps/powerpc/powerpc32/fpu/s_lround.S~ 2004-06-30 17:29:12.000000000 -0500 ++++ sysdeps/powerpc/powerpc32/fpu/s_lround.S 2005-11-18 16:48:11.000000000 -0600 +@@ -88,7 +79,6 @@ + b .L9 + END (__lround) + +-strong_alias (__lround, __lround) + weak_alias (__lround, lround) + + strong_alias (__lround, __lroundf) +--- sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S~ 2005-12-16 01:04:21.000000000 -0600 ++++ sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S 2005-12-16 01:06:26.000000000 -0600 +@@ -42,7 +42,11 @@ + #define stackblock 20 + + #ifndef __socket +-#define __socket P(__,socket) ++# ifndef NO_WEAK_ALIAS ++# define __socket P(__,socket) ++# else ++# define __socket socket ++# endif + #endif + + .text +@@ -116,4 +120,6 @@ + + PSEUDO_END (__socket) + ++#ifndef NO_WEAK_ALIAS + weak_alias (__socket, socket) ++#endif +--- sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S~ 2005-12-16 01:08:45.000000000 -0600 ++++ sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S 2005-12-16 01:09:32.000000000 -0600 +@@ -41,12 +41,12 @@ + + #define stackblock 80 /* offset to socket parm area. */ + +-#ifndef socket +-/* If this is just socket.S leave it alone! */ +-#else + #ifndef __socket +-#define __socket P(__,socket) +-#endif ++# ifndef NO_WEAK_ALIAS ++# define __socket P(__,socket) ++# else ++# define __socket socket ++# endif + #endif + + .text +@@ -120,4 +120,6 @@ + cfi_endproc + PSEUDO_END (__socket) + ++#ifndef NO_WEAK_ALIAS + weak_alias (__socket, socket) ++#endif Property changes on: glibc-package/trunk/debian/patches/powerpc-socket-weakalias.dpatch ___________________________________________________________________ Name: svn:executable + * -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]