From 08eb167b40d66da3b4a3a21351a8ed5b99fc3a83 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Sat, 24 Mar 2012 11:38:02 -0400 Subject: always build our libelf, as our libdwarf doesn't get along with the system libelf on linux --- libelf/libelf_msize.m4 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libelf/libelf_msize.m4') diff --git a/libelf/libelf_msize.m4 b/libelf/libelf_msize.m4 index 7035843..c0272e9 100644 --- a/libelf/libelf_msize.m4 +++ b/libelf/libelf_msize.m4 @@ -24,6 +24,8 @@ * SUCH DAMAGE. */ +#include "_libelf.h" +#if 0 #include __FBSDID("$FreeBSD: src/lib/libelf/libelf_msize.m4,v 1.2.10.2.2.1 2010/12/21 17:09:25 kensmith Exp $"); @@ -35,8 +37,8 @@ __FBSDID("$FreeBSD: src/lib/libelf/libelf_msize.m4,v 1.2.10.2.2.1 2010/12/21 17: #include #include #include +#endif -#include "_libelf.h" /* WARNING: GENERATED FROM __file__. */ @@ -46,7 +48,7 @@ struct msize { }; divert(-1) -include(SRCDIR`/elf_types.m4') +include(`libelf/elf_types.m4') define(BYTE_SIZE, 1) define(GNUHASH_SIZE, 1) @@ -75,9 +77,9 @@ define(`DEFINE_ELF_MSIZES', DEFINE_ELF_MSIZES(ELF_TYPE_LIST) define(`MSIZE', - `#if __FreeBSD_version >= $3 + ` [ELF_T_$1] = { .msz32 = $1_SIZE32, .msz64 = $1_SIZE64 }, -#endif') +') define(`MSIZES', `ifelse($#,1,`', `MSIZE($1) -- cgit v1.2.3