[src/trunk]: src/tools switch to the new libelf and libdwarf

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/46711a022e83
branches:  trunk
changeset: 327500:46711a022e83
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 09 17:12:03 2014 +0000

description:
switch to the new libelf and libdwarf

diffstat:

 tools/ctfconvert/Makefile |  7 ++++---
 tools/ctfmerge/Makefile   |  7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 11343161d85b -r 46711a022e83 tools/ctfconvert/Makefile
--- a/tools/ctfconvert/Makefile Sun Mar 09 17:10:38 2014 +0000
+++ b/tools/ctfconvert/Makefile Sun Mar 09 17:12:03 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2013/01/27 19:21:12 riastradh Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/09 17:12:03 christos Exp $
 
 NOMAN= # defined
 
@@ -27,8 +27,9 @@
                traverse.c \
                util.c
 
-LIBELF_DIR=    ${.CURDIR}/../../external/bsd/libelf/dist
-LIBDWARF_DIR=  ${.CURDIR}/../../external/bsd/libdwarf/dist
+ELFTOOLCHAIN_DIR=      ${.CURDIR}/../../external/bsd/elftoolchain/dist
+LIBELF_DIR=            ${ELFTOOLCHAIN_DIR}/libelf
+LIBDWARF_DIR=          ${ELFTOOLCHAIN_DIR}/libdwarf
 
 HOST_CPPFLAGS+=        -I${OSNETDIR}/sys \
                -I${OSNETDIR}/include \
diff -r 11343161d85b -r 46711a022e83 tools/ctfmerge/Makefile
--- a/tools/ctfmerge/Makefile   Sun Mar 09 17:10:38 2014 +0000
+++ b/tools/ctfmerge/Makefile   Sun Mar 09 17:12:03 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2013/01/27 19:21:12 riastradh Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/09 17:12:03 christos Exp $
 
 NOMAN= # defined
 
@@ -7,8 +7,9 @@
 HOSTPROGNAME=   ${_TOOL_PREFIX}ctfmerge
 HOST_SRCDIR=    external/cddl/osnet/usr.bin/ctfmerge
 
-LIBELF_DIR=    ${.CURDIR}/../../external/bsd/libelf/dist
-LIBDWARF_DIR=  ${.CURDIR}/../../external/bsd/libdwarf/dist
+LIBELFTOOLCHAIN_DIR=   ${.CURDIR}/../../external/bsd/elftoolchain/dist
+LIBELF_DIR=            ${LIBELFTOOLCHAIN_DIR}/libelf
+LIBDWARF_DIR=          ${LIBELFTOOLCHAIN_DIR}libdwarf
 
 HOST_CPPFLAGS+=        -I${OSNETDIR}/sys \
                -I${OSNETDIR}/include \