From 3d75624bf9ddd6680c7e87c0a5d8f26adffeef5c Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Sat, 18 Jun 2011 12:48:43 +0000 Subject: [PATCH] Slightly improve the previous patch so it should now still compile (the old way) on FreeBSD versions prior to 7.x which didn't have the extended symbols in . --- devel/libdwarf/files/patch-pro_util.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/devel/libdwarf/files/patch-pro_util.h b/devel/libdwarf/files/patch-pro_util.h index 292f8f7370ef..67478561ef56 100644 --- a/devel/libdwarf/files/patch-pro_util.h +++ b/devel/libdwarf/files/patch-pro_util.h @@ -1,11 +1,23 @@ ---- pro_util.h.orig 2011-06-18 08:45:01.000000000 +0200 -+++ pro_util.h 2011-06-18 08:45:50.000000000 +0200 -@@ -120,7 +120,7 @@ +--- pro_util.h.orig 2011-06-18 08:46:00.000000000 +0200 ++++ pro_util.h 2011-06-18 14:45:59.000000000 +0200 +@@ -34,6 +34,9 @@ + + */ + ++#if defined(__FreeBSD__) ++# include ++#endif + + + +@@ -120,7 +123,9 @@ #define Get_REL_SEGREL_isa(dbg) (R_386_NONE) /* I don't know! */ #endif /* sparc || i386 */ #else /* !sun */ -#ifdef HAVE_SYS_IA64_ELF_H -+#if defined(HAVE_SYS_IA64_ELF_H) || defined(__FreeBSD__) ++#if defined(HAVE_SYS_IA64_ELF_H) ||\ ++ /* FreeBSD 7.x and above always have these */ \ ++ (defined(__FreeBSD__) && __FreeBSD_version > 700000) #define Get_REL64_isa(dbg) (ISA_IA64(dbg) ? \ DWARF_PRO_R_IA64_DIR64LSB : R_MIPS_64) #define Get_REL32_isa(dbg) (ISA_IA64(dbg) ? \