Module Name:    src
Committed By:   christos
Date:           Sun Mar  9 17:10:12 UTC 2014

Modified Files:
        src/tools/libelf: Makefile libelf.inc

Log Message:
switch to the new libelf


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tools/libelf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/libelf/libelf.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/libelf/Makefile
diff -u src/tools/libelf/Makefile:1.7 src/tools/libelf/Makefile:1.8
--- src/tools/libelf/Makefile:1.7	Sun Dec 16 01:47:39 2012
+++ src/tools/libelf/Makefile	Sun Mar  9 13:10:12 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2012/12/16 06:47:39 apb Exp $
+#	$NetBSD: Makefile,v 1.8 2014/03/09 17:10:12 christos Exp $
 
 HOSTLIB=	elf
 
@@ -31,11 +31,14 @@ SRCS=		elf_begin.c						\
 		gelf_rel.c gelf_rela.c					\
 		gelf_shdr.c gelf_sym.c gelf_syminfo.c gelf_symshndx.c	\
 		gelf_xlate.c						\
-		libelf.c						\
+		elf.c							\
 		libelf_align.c libelf_allocate.c libelf_ar.c		\
+		libelf_ar_util.c					\
 		libelf_checksum.c					\
 		libelf_data.c						\
 		libelf_ehdr.c libelf_extended.c				\
+		libelf_memory.c						\
+		libelf_open.c						\
 		libelf_phdr.c						\
 		libelf_shdr.c						\
 		libelf_xlate.c						\
@@ -43,10 +46,10 @@ SRCS=		elf_begin.c						\
 
 LIBELF_GENSRCS=	libelf_fsize.c libelf_msize.c libelf_convert.c
 
-LIBELF_DIR=	${.CURDIR}/../../external/bsd/libelf/dist
+LIBELF_DIR=	${.CURDIR}/../../external/bsd/elftoolchain/dist/libelf
 
 CLEANFILES+=	${LIBELF_GENSRCS}
-CPPFLAGS+=	-I${.CURDIR}/../compat -I${LIBELF_DIR}
+CPPFLAGS+=	-I${.CURDIR}/../compat -I${LIBELF_DIR} -I${LIBELF_DIR}/../common
 CPPFLAGS+=	-I${TOOLDIR}/include/nbinclude
 
 CPPFLAGS+=	-DLIBELF_TEST_HOOKS

Index: src/tools/libelf/libelf.inc
diff -u src/tools/libelf/libelf.inc:1.1 src/tools/libelf/libelf.inc:1.2
--- src/tools/libelf/libelf.inc:1.1	Mon Dec 21 13:21:18 2009
+++ src/tools/libelf/libelf.inc	Sun Mar  9 13:10:12 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: libelf.inc,v 1.1 2009/12/21 18:21:18 thorpej Exp $
+#	$NetBSD: libelf.inc,v 1.2 2014/03/09 17:10:12 christos Exp $
 
-LIBELFSRCDIR=	${.CURDIR}/../../external/bsd/libelf/dist
+LIBELFSRCDIR=	${.CURDIR}/../../external/bsd/elftoolchain/dist/libelf
 LIBELFOBJDIR!=	cd ${.CURDIR}/../libelf && ${PRINTOBJDIR}

Reply via email to