Hi Thomas,
Thomas Schwinge <tho...@schwinge.name> skribis:
> On Wed, 23 Mar 2011 14:30:17 +0100, l...@gnu.org (Ludovic
> =?iso-8859-1?Q?Court=E8s?=) wrote:
[...]
>> A further complication is that ‘tg remote --populate’ did not fetch the
>> ‘baseline’ branch, which is consequently reported as a missing
>> dependency. Running ‘git branch --track baseline origin/baseline’
>> solves the problem, [...].
>>
>> Any suggestions?
>
> I could perhaps turn baseline into a TopGit branch, and have it depend on
> a commit via a SHA1. I'll have to think about this some more.
In the meantime I’ve changed the commit SHA1 [0], and it does lead to a
patch that applies to current Sourceware libc [1].
However the resulting code fails to cross-build [2]:
--8<---------------cut here---------------start------------->8---
gawk -f ../scripts/gen-as-const.awk ../sysdeps/i386/tlsdesc.sym \
| i586-pc-gnu-gcc -S -o
/tmp/nix-build-im598ff2ngv32ah38dl5bjkvhmgkybjq-glibc-2.14-375-gaac1330-i586-pc-gnu.drv-0/build/tlsdesc.hT3
-std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings
-fmerge-all-constants -g -Wno-parentheses -Wstrict-prototypes
-mpreferred-stack-boundary=4 -I../include
-I/tmp/nix-build-im598ff2ngv32ah38dl5bjkvhmgkybjq-glibc-2.14-375-gaac1330-i586-pc-gnu.drv-0/build/csu
-I/tmp/nix-build-im598ff2ngv32ah38dl5bjkvhmgkybjq-glibc-2.14-375-gaac1330-i586-pc-gnu.drv-0/build
-I../sysdeps/i386/elf -I../sysdeps/mach/hurd/i386 -I../sysdeps/mach/hurd
-I../sysdeps/gnu -I../sysdeps/unix/bsd/bsd4.4 -I../sysdeps/unix/mman
-I../sysdeps/mach/i386 -I../sysdeps/mach -I../sysdeps/i386/i586
-I../sysdeps/i386/i486 -I../sysdeps/i386/fpu -I../sysdeps/i386
-I../sysdeps/wordsize-32 -I../sysdeps/ieee754/ldbl-96
-I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754/flt-32 -I../sysdeps/unix/bsd
-I../sysdeps/unix/common -I../sysdeps/unix/inet -I../sysdeps/unix
-I../sysdeps/posix -I../sysdeps/ieee754 -I../sysdeps/generic/elf
-I../sysdeps/generic -I../hurd
-I/tmp/nix-build-im598ff2ngv32ah38dl5bjkvhmgkybjq-glibc-2.14-375-gaac1330-i586-pc-gnu.drv-0/build/hurd/
-I../mach
-I/tmp/nix-build-im598ff2ngv32ah38dl5bjkvhmgkybjq-glibc-2.14-375-gaac1330-i586-pc-gnu.drv-0/build/mach/
-I.. -I../libio -I. -nostdinc -isystem
/nix/store/8fhsm5pzdzamdfcr9mv6zya7mpv8x754-gcc-4.5.1-i586-pc-gnu-stage-final/lib/gcc/i586-pc-gnu/4.5.1/include
-isystem
/nix/store/8fhsm5pzdzamdfcr9mv6zya7mpv8x754-gcc-4.5.1-i586-pc-gnu-stage-final/lib/gcc/i586-pc-gnu/4.5.1/include-fixed
-isystem
/nix/store/4jxl1k33n0zly3yhcf9phbxhyhlqbm7i-hurd-headers-20110516/include
-D_LIBC_REENTRANT -include ../include/libc-symbols.h -DHAVE_INITFINI -x c
- \
-MD -MP -MF
/tmp/nix-build-im598ff2ngv32ah38dl5bjkvhmgkybjq-glibc-2.14-375-gaac1330-i586-pc-gnu.drv-0/build/tlsdesc.h.dT
-MT
'/tmp/nix-build-im598ff2ngv32ah38dl5bjkvhmgkybjq-glibc-2.14-375-gaac1330-i586-pc-gnu.drv-0/build/tlsdesc.h.d
/tmp/nix-build-im598ff2ngv32ah38dl5bjkvhmgkybjq-glibc-2.14-375-gaac1330-i586-pc-gnu.drv-0/build/tlsdesc.h'
In file included from ../sysdeps/mach/hurd/tls.h:31:0,
from ../sysdeps/mach/hurd/i386/tls.h:25,
from ../sysdeps/mach/i386/sysdep.h:26,
from <stdin>:2:
/nix/store/364bfszli2pgpk58sfqpw5iqir4jcdv0-gnumach-headers-20100512/include/mach/mig_errors.h:71:3:
warning: function declaration isn't a prototype
<stdin>: In function 'dummy':
<stdin>:7:67: error: invalid use of undefined type 'struct pthread'
make[2]: ***
[/tmp/nix-build-im598ff2ngv32ah38dl5bjkvhmgkybjq-glibc-2.14-375-gaac1330-i586-pc-gnu.drv-0/build/tlsdesc.h]
Error 1
--8<---------------cut here---------------end--------------->8---
I think the problem is that i386/tlsdesc.sym is being used in lieu of
mach/hurd/i386/tlsdesc.sym, right?
Thanks,
Ludo’.
[0]
http://git.savannah.gnu.org/cgit/hydra-recipes.git/commit/?id=7f49a0c373af0e592c8ee4302ddbab6722b20fd4
[1] http://hydra.nixos.org/job/gnu/glibc-hurd/tarball
[2] http://hydra.nixos.org/build/1458641
