Merge branch 'loganbruns-changes_for_centos7'

Author: dtrace4linux

tools/get-deps-fedora.sh

@@ -14,6 +14,7 @@ yum install \
 	kernel-devel \
 	libdwarf \
 	libdwarf-devel \
+	libdwarf-static \
 	libgcc.i686 \
 	make \
 	perl \

tools/mkport.pl

@@ -361,7 +361,11 @@ sub check_dwarf_h
 int main(int argc, char **argv)
 {
 	dwarf_begin();
+<<<<<<< HEAD
 	return 0;
+=======
+	dwarf_loclist();
+>>>>>>> 8ee119b297aa0b30d99ac5817b99d342bf7edab5
 }
 EOF
 	$fh->close();