Hi! On Sat, 29 Oct 2011 15:39:00 +0200, l...@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) wrote: > In related issues, I’m still failing to do this: > > --8<---------------cut here---------------start------------->8--- > $ tg export --linearize for-upstream-glibc > Already up-to-date! > skip empty commit baseline > Already up-to-date! > skip empty commit baseline > exported commit t/init-first.c > Already up-to-date! > skip empty commit baseline > exported commit t/kernel-features.h_includes > Already up-to-date! > skip empty commit baseline > exported commit t/libc_once > [...] > skip empty commit t/socketpair_flags > exported commit t/pipe2 > Already up-to-date! > skip empty commit baseline > Auto-merging sysdeps/mach/hurd/kernel-features.h > CONFLICT (content): Merge conflict in sysdeps/mach/hurd/kernel-features.h > fix up the merge and update the index. Don't commit! > sh-4.2$ > --8<---------------cut here---------------end--------------->8---
Could you give this patch a try: <http://bugs.debian.org/646944>. Also, if you could verify Ian's reasoning, that'd be great. (I have not yet found the time.) > Besides, the part of the Savannah patch that touches > sysdeps/i386/configure fails to apply to Sourceware’s glibc > (unsurprisingly): <http://hydra.nixos.org/build/1483499>. That's the reason for t/regenerate_configure, which brings all configure files into a consistent state. Grüße, Thomas
pgp5q59lFARtV.pgp
Description: PGP signature
