Date: Tue, 21 Jan 2014 20:42:16 +0000 (UTC) From: Kai Wang <kaiw@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260991 - in projects/elftoolchain/lib: libdwarf libelf Message-ID: <201401212042.s0LKgGkx050198@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kaiw Date: Tue Jan 21 20:42:15 2014 New Revision: 260991 URL: http://svnweb.freebsd.org/changeset/base/260991 Log: Reapply revisions r237528, r237531 and r238741 which make libelf properly include sys/ headers from the source tree instead of the host. These patches are also applied to libdwarf since libdwarf requires the same sys/ headers as libelf. Modified: projects/elftoolchain/lib/libdwarf/Makefile projects/elftoolchain/lib/libelf/Makefile Modified: projects/elftoolchain/lib/libdwarf/Makefile ============================================================================== --- projects/elftoolchain/lib/libdwarf/Makefile Tue Jan 21 20:23:39 2014 (r260990) +++ projects/elftoolchain/lib/libdwarf/Makefile Tue Jan 21 20:42:15 2014 (r260991) @@ -75,14 +75,27 @@ SRCS= \ INCS= dwarf.h libdwarf.h +# +# We need to link against the correct version of these files. One +# solution is to include ../../sys in the include path. This causes +# problems when a header file in sys depends on a file in another +# part of the tree, e.g. a machine dependent header. +# +SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h + GENSRCS= dwarf_pubnames.c dwarf_pubtypes.c dwarf_weaks.c \ dwarf_funcs.c dwarf_vars.c dwarf_types.c \ dwarf_pro_pubnames.c dwarf_pro_weaks.c \ dwarf_pro_funcs.c dwarf_pro_types.c \ dwarf_pro_vars.c CLEANFILES= ${GENSRCS} +CLEANDIRS= sys CFLAGS+= -I. -I${SRCDIR} -I${TOP}/common -I${TOP}/libelf +sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} + mkdir -p ${.OBJDIR}/sys + ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET} + LDADD+= -lelf DPADD+= ${LIBELF} Modified: projects/elftoolchain/lib/libelf/Makefile ============================================================================== --- projects/elftoolchain/lib/libelf/Makefile Tue Jan 21 20:23:39 2014 (r260990) +++ projects/elftoolchain/lib/libelf/Makefile Tue Jan 21 20:42:15 2014 (r260991) @@ -65,10 +65,23 @@ SRCS= elf.c \ INCS= libelf.h gelf.h +# +# We need to link against the correct version of these files. One +# solution is to include ../../sys in the include path. This causes +# problems when a header file in sys depends on a file in another +# part of the tree, e.g. a machine dependent header. +# +SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h + GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c CLEANFILES= ${GENSRCS} +CLEANDIRS= sys CFLAGS+= -I. -I${SRCDIR} -I${TOP}/common +sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} + mkdir -p ${.OBJDIR}/sys + ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET} + SHLIB_MAJOR= 1 MAN= elf.3 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401212042.s0LKgGkx050198>