Module Name: src
Committed By: thorpej
Date: Tue Dec 29 17:32:18 UTC 2009
Modified Files:
src/external/bsd/libelf/dist: libelf.h
src/tools/libelf: Makefile
Log Message:
Include nbtool_config.h as needed. Should fix missing defn of __unused in
some host tool environments.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libelf/dist/libelf.h
cvs rdiff -u -r1.2 -r1.3 src/tools/libelf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libelf/dist/libelf.h
diff -u src/external/bsd/libelf/dist/libelf.h:1.5 src/external/bsd/libelf/dist/libelf.h:1.6
--- src/external/bsd/libelf/dist/libelf.h:1.5 Mon Dec 21 18:21:17 2009
+++ src/external/bsd/libelf/dist/libelf.h Tue Dec 29 17:32:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: libelf.h,v 1.5 2009/12/21 18:21:17 thorpej Exp $ */
+/* $NetBSD: libelf.h,v 1.6 2009/12/29 17:32:18 thorpej Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -36,6 +36,7 @@
#include <inttypes.h>
#if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
# include <nbinclude/sys/exec_elf.h>
# define __LIBELF_HAVE_ELF_CAP 1
# define __LIBELF_HAVE_ELF_MOVE 1
Index: src/tools/libelf/Makefile
diff -u src/tools/libelf/Makefile:1.2 src/tools/libelf/Makefile:1.3
--- src/tools/libelf/Makefile:1.2 Wed Dec 23 20:28:29 2009
+++ src/tools/libelf/Makefile Tue Dec 29 17:32:18 2009
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2009/12/23 20:28:29 cegger Exp $
+# $NetBSD: Makefile,v 1.3 2009/12/29 17:32:18 thorpej Exp $
+
+.include <bsd.own.mk>
HOSTLIB= elf
@@ -64,6 +66,10 @@
# other file ops, on many systems, without changing function names.
CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
+.ifndef NOCOMPATLIB
+COMPATOBJ!= cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
+CPPFLAGS+= -I${COMPATOBJ}
+.endif
.PATH: ${LIBELF_DIR}
