Author: sthibault Date: 2013-10-09 23:37:56 +0000 (Wed, 09 Oct 2013) New Revision: 5717
Added: glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-multi_arch.diff Modified: glibc-package/branches/eglibc-2.18/debian/changelog glibc-package/branches/eglibc-2.18/debian/patches/series Log: * patches/any/multi_arch.diff: New patch, fixes undefined reference failure with non-multiarch builds. Modified: glibc-package/branches/eglibc-2.18/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-09 22:22:41 UTC (rev 5716) +++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-09 23:37:56 UTC (rev 5717) @@ -55,6 +55,8 @@ * patches/hurd-i386/libpthread_hurd_cond_timedwait.diff: Add missing version. * patches/hurd-i386/libpthread_hurd_cond_wait.diff: Likewise. + * patches/any/multi_arch.diff: New patch, fixes undefined reference failure + with non-multiarch builds. -- Adam Conrad <adcon...@ubuntu.com> Sun, 25 Aug 2013 14:59:44 -0600 Added: glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-multi_arch.diff =================================================================== --- glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-multi_arch.diff (rev 0) +++ glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-multi_arch.diff 2013-10-09 23:37:56 UTC (rev 5717) @@ -0,0 +1,19 @@ +This only applies for builds with multiarch enabled. + +--- + symbol-hacks.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Index: eglibc-2.18/sysdeps/generic/symbol-hacks.h +=================================================================== +--- eglibc-2.18.orig/sysdeps/generic/symbol-hacks.h 2013-06-15 17:37:04.000000000 +0000 ++++ eglibc-2.18/sysdeps/generic/symbol-hacks.h 2013-10-09 23:31:32.000000000 +0000 +@@ -1,6 +1,9 @@ + /* Some compiler optimizations may transform loops into memset/memmove + calls and without proper declaration it may generate PLT calls. */ + #if !defined __ASSEMBLER__ && !defined NOT_IN_libc && defined SHARED ++#include <config.h> ++# if defined USE_MULTIARCH + asm ("memmove = __GI_memmove"); + asm ("memset = __GI_memset"); ++# endif + #endif Modified: glibc-package/branches/eglibc-2.18/debian/patches/series =================================================================== --- glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-09 22:22:41 UTC (rev 5716) +++ glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-09 23:37:56 UTC (rev 5717) @@ -234,3 +234,4 @@ any/local-tst-eintr1-eagain.diff any/unsubmitted-ldso-machine-mismatch.diff any/cvs-tst-tls-atexit-deps.diff +any/unsubmitted-multi_arch.diff -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vu3kh-00083u...@vasks.debian.org