Re: CVS commit: src/external/bsd/libelf/dist

[Frank Kardel <kardel%netbsd.org@localhost>]

Hi Jason !

Could this build.sh release breakage (during toolbuild) be related or do 
I need to fix my copy of the tree ?

   compile  libelf/elf_begin.lo
In file included from 
/fs/raid1a/src/NetBSD/tc-merge/src/obj.i386/tools/compat/nbtool_config.h:634,
                from 
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../../external/bsd/libelf/dist/libelf.h:39,
                from 
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../../external/bsd/libelf/dist/elf_begin.c:39:
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../compat/compat_defs.h:66:2: 
error: #error _NETBSD_SOURCE is *not* to be defined.
In file included from 
/fs/raid1a/src/NetBSD/tc-merge/src/obj.i386/tools/compat/nbtool_config.h:634,
                from 
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../../external/bsd/libelf/dist/libelf.h:39,
                from 
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../../external/bsd/libelf/dist/elf_begin.c:39:
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../compat/compat_defs.h:214: 
error: redefinition of 'struct _dirdesc'
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../compat/compat_defs.h:225:1: 
warning: "dirfd" redefined
In file included from 
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../compat/compat_defs.h:131,
                from 
/fs/raid1a/src/NetBSD/tc-merge/src/obj.i386/tools/compat/nbtool_config.h:634,
                from 
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../../external/bsd/libelf/dist/libelf.h:39,
                from 
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../../external/bsd/libelf/dist/elf_begin.c:39:
/usr/include/dirent.h:70:1: warning: this is the location of the 
previous definition

*** Failed target:  elf_begin.lo
*** Failed command: cc -O 
-I/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../compat 
-I/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../../external/bsd/libelf/dist 
-I/usr/btools/include/nbinclude -DLIBELF_TEST_HOOKS 
-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 
-I/fs/raid1a/src/NetBSD/tc-merge/src/obj.i386/tools/compat 
-I/usr/btools/include -c -o elf_begin.lo.o 
/fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf/../../external/bsd/libelf/dist/elf_begin.c
*** Error code 1

Stop.
nbmake: stopped in /fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf

*** Failed target:  dependall
*** Failed command: cd /fs/raid1a/src/NetBSD/tc-merge/src/tools/libelf; 
/usr/btools/bin/nbmake realall
*** Error code 1

Frank

Jason R Thorpe wrote:
> Module Name:    src
> Committed By:   thorpej
> Date:           Tue Dec 29 17:05:59 UTC 2009
>
> Modified Files:
>         src/external/bsd/libelf/dist: elf_begin.c elf_data.c elf_hash.c
>             elf_scn.c elf_update.c gelf_cap.c gelf_dyn.c gelf_ehdr.c
>             gelf_move.c gelf_phdr.c gelf_rel.c gelf_rela.c gelf_shdr.c
>             gelf_sym.c gelf_syminfo.c gelf_symshndx.c libelf.c libelf_align.c
>             libelf_allocate.c libelf_ar.c libelf_convert.m4 libelf_data.c
>             libelf_ehdr.c libelf_msize.m4 libelf_phdr.c libelf_xlate.c
>
> Log Message:
> Merge FreeBSD-8-0-RELEASE.  All this does is remove the __RCSID() tags
> due to the modified prepare-import.sh.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libelf/dist/elf_begin.c \
>     src/external/bsd/libelf/dist/gelf_cap.c \
>     src/external/bsd/libelf/dist/gelf_move.c \
>     src/external/bsd/libelf/dist/gelf_syminfo.c \
>     src/external/bsd/libelf/dist/libelf_align.c \
>     src/external/bsd/libelf/dist/libelf_allocate.c \
>     src/external/bsd/libelf/dist/libelf_ar.c
> cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libelf/dist/elf_data.c \
>     src/external/bsd/libelf/dist/elf_hash.c \
>     src/external/bsd/libelf/dist/elf_update.c \
>     src/external/bsd/libelf/dist/gelf_dyn.c \
>     src/external/bsd/libelf/dist/gelf_ehdr.c \
>     src/external/bsd/libelf/dist/gelf_phdr.c \
>     src/external/bsd/libelf/dist/gelf_rel.c \
>     src/external/bsd/libelf/dist/gelf_rela.c \
>     src/external/bsd/libelf/dist/gelf_shdr.c \
>     src/external/bsd/libelf/dist/gelf_sym.c \
>     src/external/bsd/libelf/dist/gelf_symshndx.c \
>     src/external/bsd/libelf/dist/libelf_data.c \
>     src/external/bsd/libelf/dist/libelf_phdr.c \
>     src/external/bsd/libelf/dist/libelf_xlate.c
> cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libelf/dist/elf_scn.c \
>     src/external/bsd/libelf/dist/libelf_ehdr.c \
>     src/external/bsd/libelf/dist/libelf_msize.m4
> cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libelf/dist/libelf.c
> cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libelf/dist/libelf_convert.m4
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>