Fix test posix/annexc

Fix test posix/annexc

[Andreas Jaeger]

[-- Attachment #1: Type: text/plain, Size: 4101 bytes --]


posix/annexc is broken since the reorganization of the files, make
check gives these errors now:

make[2]: Entering directory `/cvs/libc/posix'
/builds/glibc/4.2-nptl/posix/annexc '/opt/gcc/4.2-devel/bin/gcc' \
  '-I../csu -I../iconv -I../iconvdata -I../locale -I../localedata -I../assert -I../ctype -I../intl -I../catgets -I../math -I../setjmp -I../signal -I../stdlib -I../stdio-common -I../libio -I../dlfcn -I../malloc -I../string -I../wcsmbs -I../timezone -I../time -I../dirent -I../grp -I../pwd -I../posix -I../io -I../termios -I../resource -I../misc -I../socket -I../sysvipc -I../gmon -I../gnulib -I../wctype -I../manual -I../shadow -I../po -I../argp -I../crypt -I../nptl -I../libidn -I../resolv -I../nss -I../rt -I../conform -I../debug -I../nptl_db -I../inet -I../hesiod -I../sunrpc -I../nis -I../nscd -I../streams -I../login -I../elf -I../include -I.. -I/builds/glibc/4.2-nptl -I../sysdeps/x86_64/elf -I../nptl/sysdeps/unix/sysv/linux/x86_64 -I../sysdeps/unix/sysv/linux/x86_64 -I../sysdeps/unix/sysv/linux/wordsize-64 -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../sysdeps/unix/x86_64 -I../nptl/sysdeps/unix -I../libidn/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../sysdeps/x86_64/fpu -I../nptl/sysdeps/x86_64 -I../sysdeps/x86_64 -I../sysdeps/wordsize-64 -I../sysdeps/ieee754/ldbl-96 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754/flt-32 -I../nptl/sysdeps/generic -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic ' > /builds/glibc/4.2-nptl/posix/annexc.out
In file included from ../bits/types.h:28,
                 from ../bits/fcntl.h:69,
                 from ../io/fcntl.h:34,
                 from ../rt/aio.h:27,
                 from <stdin>:1:
../bits/wordsize.h:1:2: error: #error "This file must be written based on the data type sizes of the target"
In file included from ../bits/fcntl.h:69,
                 from ../io/fcntl.h:34,
                 from ../rt/aio.h:27,
                 from <stdin>:1:
../bits/types.h:132:3: error: #error
In file included from ../bits/types.h:28,
                 from ../ctype/ctype.h:28,
                 from <stdin>:1:
../bits/wordsize.h:1:2: error: #error "This file must be written based on the data type sizes of the target"
In file included from ../ctype/ctype.h:28,
                 from <stdin>:1:
../bits/types.h:132:3: error: #error
In file included from ../string/endian.h:37,
                 from ../ctype/ctype.h:41,
                 from <stdin>:1:
../bits/endian.h:13:2: error: #error Machine byte order unknown.
In file included from ../bits/types.h:28,
                 from ../dirent/dirent.h:30,
                 from <stdin>:1:

The appended patch fixes this. Ok to commit?

Andreas

2006-01-02  Andreas Jaeger  <aj@suse.de>

	* posix/Makefile ($(objpfx)annexc.out): Fix order of includes.

============================================================
Index: posix/Makefile
--- posix/Makefile	26 Sep 2005 21:13:27 -0000	1.186
+++ posix/Makefile	2 Jan 2006 13:01:04 -0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1999, 2000-2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1991-1999, 2000-2003, 2004, 2005, 2006 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
@@ -220,7 +220,7 @@ endif
 
 $(objpfx)annexc.out: $(objpfx)annexc
 	-$(dir $<)$(notdir $<) '$(CC)' \
-	  '$(patsubst %,-I../%,$(sorted-subdirs)) -I../include -I.. $(+sysdep-includes) $(sysincludes)' > $@
+	  '$(+sysdep-includes) $(sysincludes) $(patsubst %,-I../%,$(sorted-subdirs)) -I../include -I..' > $@
 
 annexc-CFLAGS = -O
 $(objpfx)annexc: annexc.c

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

Re: Fix test posix/annexc

[Ulrich Drepper]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

All that's needed is to move -I.. to the end of the list as it was
necessary in a few other places.  I've done that now.

-- 
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 251 bytes --]