Attachment #177707 for bug #215086

View | Details | Raw Unified | Return to bug 215086
Collapse All | Expand All

Lines 2-8 Link Here

(-)devel/dwarfdump/Makefile (-1 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dwarfdump	4	PORTNAME= dwarfdump
5	PORTVERSION= 20130207	5	PORTVERSION= 20161124
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= http://www.prevanders.net/	7	MASTER_SITES= http://www.prevanders.net/
8	DISTNAME= libdwarf-${PORTVERSION}	8	DISTNAME= libdwarf-${PORTVERSION}
Lines 10-15 Link Here
10	MAINTAINER= joerg@FreeBSD.org	10	MAINTAINER= joerg@FreeBSD.org
11	COMMENT= Tool to display DWARF debugging information in ELF files	11	COMMENT= Tool to display DWARF debugging information in ELF files
12		12
		13	LICENSE= GPLv2
		14
13	BUILD_DEPENDS= ${LOCALBASE}/lib/libdwarf.a:devel/libdwarf	15	BUILD_DEPENDS= ${LOCALBASE}/lib/libdwarf.a:devel/libdwarf
14		16
15	WRKSRC= ${WRKDIR}/dwarf-${PORTVERSION}/dwarfdump	17	WRKSRC= ${WRKDIR}/dwarf-${PORTVERSION}/dwarfdump

Lines 1-2 Link Here

(-)devel/dwarfdump/distinfo (-2 / +3 lines)
1	SHA256 (libdwarf-20130207.tar.gz) = 5cb81459f0a1f6a2a10ef4635faddc2fa5e1a9e36901018c017759e491e708b8	1	TIMESTAMP = 1481000089
2	SIZE (libdwarf-20130207.tar.gz) = 1534527	2	SHA256 (libdwarf-20161124.tar.gz) = bd3d6dc7da0509876fb95b8681f165febd898845dc66714aa58e69b8feca988f
		3	SIZE (libdwarf-20161124.tar.gz) = 1732155




--- Makefile.in~	2013-02-02 20:13:55.000000000 +0100
+++ Makefile.in	2013-04-10 09:11:17.000000000 +0200
@@ -98,7 +98,7 @@
 
 # gennames should use a static libdwarf.
 gennames: $(srcdir)/gennames.c $(DIRINC)/dwarf.h $(HEADERS) common.o
-	$(CC) $(CFLAGS) $(srcdir)/gennames.c common.o ../libdwarf/libdwarf.a $(LDFLAGS) -o gennames
+	$(CC) $(CFLAGS) $(srcdir)/gennames.c common.o $(LDFLAGS) -ldwarf -o gennames
 naming.o:  $(srcdir)/naming.c $(srcdir)/naming.h
 	$(CC) $(CFLAGS) -c $(srcdir)/naming.c
 
@@ -109,10 +109,10 @@
 
 # Use static libdwarf.a
 tag_tree_build:  $(srcdir)/tag_tree.c $(DIRINC)/dwarf.h $(HEADERS) tag_common.o makename.o common.o trivial_naming.o
-	$(CC) $(CFLAGS) $(srcdir)/tag_tree.c tag_common.o common.o makename.o trivial_naming.o ../libdwarf/libdwarf.a $(LDFLAGS) -o tag_tree_build 
+	$(CC) $(CFLAGS) $(srcdir)/tag_tree.c tag_common.o common.o makename.o trivial_naming.o $(LDFLAGS) -ldwarf -o tag_tree_build 
 
 tag_attr_build:  $(srcdir)/tag_attr.c $(DIRINC)/dwarf.h $(HEADERS) tag_common.o makename.o common.o trivial_naming.o
-	$(CC) $(CFLAGS) $(srcdir)/tag_attr.c tag_common.o common.o makename.o trivial_naming.o ../libdwarf/libdwarf.a $(LDFLAGS) -o tag_attr_build 
+	$(CC) $(CFLAGS) $(srcdir)/tag_attr.c tag_common.o common.o makename.o trivial_naming.o $(LDFLAGS) -ldwarf -o tag_attr_build 
 
 tmp-tt-table.c tmp-tt-ext-table.c: $(srcdir)/tag_tree_ext.list $(srcdir)/tag_tree.list tag_tree_build
 	# gcc -E tag_tree.list does not work, so use a .c name

Lines 1-11 Link Here

(-)devel/dwarfdump/files/patch-configure (-5 / +5 lines)
1	--- configure.orig 2010-02-04 22:00:43.000000000 +0000	1	--- configure.orig 2016-12-06 05:12:37 UTC
2	+++ configure 2010-02-08 13:36:07.000000000 +0000	2	+++ configure
3	@@ -3508,7 +3508,7 @@	3	@@ -3585,7 +3585,7 @@ fi
4	done	4	done
5		5
6		6
7	-for ac_header in elf.h getopt.h libelf.h libelf/libelf.h sgidefs.h sys/types.h	7	-for ac_header in elf.h unistd.h libelf.h libelf/libelf.h sgidefs.h sys/types.h
8	+for ac_header in getopt.h libelf.h libelf/libelf.h sgidefs.h sys/types.h	8	+for ac_header in unistd.h libelf.h libelf/libelf.h sgidefs.h sys/types.h
9	do :	9	do :
10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
11	ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"	11	ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

Return to bug 215086

Lines 1-24 Link Here

(-)devel/dwarfdump/files/patch-Makefile.in (-24 lines)
1	--- Makefile.in~ 2013-02-02 20:13:55.000000000 +0100
2	+++ Makefile.in 2013-04-10 09:11:17.000000000 +0200
3	@@ -98,7 +98,7 @@
4
5	# gennames should use a static libdwarf.
6	gennames: $(srcdir)/gennames.c $(DIRINC)/dwarf.h $(HEADERS) common.o
7	- $(CC) $(CFLAGS) $(srcdir)/gennames.c common.o ../libdwarf/libdwarf.a $(LDFLAGS) -o gennames
8	+ $(CC) $(CFLAGS) $(srcdir)/gennames.c common.o $(LDFLAGS) -ldwarf -o gennames
9	naming.o: $(srcdir)/naming.c $(srcdir)/naming.h
10	$(CC) $(CFLAGS) -c $(srcdir)/naming.c
11
12	@@ -109,10 +109,10 @@
13
14	# Use static libdwarf.a
15	tag_tree_build: $(srcdir)/tag_tree.c $(DIRINC)/dwarf.h $(HEADERS) tag_common.o makename.o common.o trivial_naming.o
16	- $(CC) $(CFLAGS) $(srcdir)/tag_tree.c tag_common.o common.o makename.o trivial_naming.o ../libdwarf/libdwarf.a $(LDFLAGS) -o tag_tree_build
17	+ $(CC) $(CFLAGS) $(srcdir)/tag_tree.c tag_common.o common.o makename.o trivial_naming.o $(LDFLAGS) -ldwarf -o tag_tree_build
18
19	tag_attr_build: $(srcdir)/tag_attr.c $(DIRINC)/dwarf.h $(HEADERS) tag_common.o makename.o common.o trivial_naming.o
20	- $(CC) $(CFLAGS) $(srcdir)/tag_attr.c tag_common.o common.o makename.o trivial_naming.o ../libdwarf/libdwarf.a $(LDFLAGS) -o tag_attr_build
21	+ $(CC) $(CFLAGS) $(srcdir)/tag_attr.c tag_common.o common.o makename.o trivial_naming.o $(LDFLAGS) -ldwarf -o tag_attr_build
22
23	tmp-tt-table.c tmp-tt-ext-table.c: $(srcdir)/tag_tree_ext.list $(srcdir)/tag_tree.list tag_tree_build
24	# gcc -E tag_tree.list does not work, so use a .c name