Attachment #223138 for bug #254176

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

Lines 1-7 Link Here

(-)Makefile (-1 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= dwz	3	PORTNAME= dwz
4	DISTVERSION= 0.13	4	DISTVERSION= 0.14
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://sourceware.org/ftp/dwz/releases/	6	MASTER_SITES= https://sourceware.org/ftp/dwz/releases/
7		7
Lines 11-16 Link Here
11	LICENSE= GPLv3+	11	LICENSE= GPLv3+
12	LICENSE_FILE= ${WRKSRC}/COPYING3	12	LICENSE_FILE= ${WRKSRC}/COPYING3
13		13
		14	ALL_TARGET= dwz
		15
14	WRKSRC= ${WRKDIR}/${PORTNAME}	16	WRKSRC= ${WRKDIR}/${PORTNAME}
15		17
16	.include <bsd.port.mk>	18	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1586106922	1	TIMESTAMP = 1615329145
2	SHA256 (dwz-0.13.tar.gz) = 05166ad9d3173e92a517ef94aa2b149bca7d717a8c2ea88e28e4e39670c491ec	2	SHA256 (dwz-0.14.tar.gz) = 33006eab875ff0a07f13fc885883c5bd9514d83ecea9f18bc46b5732dddf0d1f
3	SIZE (dwz-0.13.tar.gz) = 143279	3	SIZE (dwz-0.14.tar.gz) = 186623




--- Makefile.orig	2021-03-08 07:56:18 UTC
+++ Makefile
@@ -1,23 +1,20 @@
-ifneq ($(srcdir),)
-VPATH = $(srcdir)
-else

-endif
-CFLAGS = -O2 -g
-DWZ_VERSION := $(shell cat $(srcdir)/VERSION)
-override CFLAGS += -Wall -W -D_FILE_OFFSET_BITS=64 \
-	-DDWZ_VERSION='"$(DWZ_VERSION)"' $(shell cat $(srcdir)/COPYRIGHT_YEARS)
-prefix = /usr
+srcdir = .
+CFLAGS ?= -O2 -g
+DWZ_VERSION != cat $(srcdir)/VERSION
+CFLAGS += -DDWZ_VERSION='"$(DWZ_VERSION)"'
+CYEARS != cat $(srcdir)/COPYRIGHT_YEARS
+CFLAGS += $(CYEARS)
+prefix = /usr/local
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 datarootdir = $(prefix)/share
-mandir = $(datarootdir)/man
-OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o
+mandir = $(prefix)/man
+OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o obstack.o
 dwz: $(OBJECTS)
-	$(CC) $(LDFLAGS) -o $@ $^ -lelf
+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lelf
 install: dwz
-	install -D dwz $(DESTDIR)$(bindir)/dwz
-	install -D -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
+	install dwz $(DESTDIR)$(bindir)/dwz
+	install -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
+all: $(OBJECTS)
+	$(CC) $(LDFLAGS) -o dwz ${OBJECTS} -lelf
+install: all
+	install -c -s dwz $(DESTDIR)$(bindir)/dwz
+	install -c -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
 clean:
 	rm -f $(OBJECTS) *~ core* dwz $(TEST_EXECS) $(DWZ_TEST_SOURCES) \
 	  dwz.log dwz.sum
@@ -51,7 +46,7 @@ DWZ_TEST_SOURCES := $(patsubst %.o,%-for-test.c,$(OBJE
 	sed 's/__GNUC__/NOT_DEFINED/' $< > $@
 
 dwz-for-test: $(DWZ_TEST_SOURCES)
-	$(CC) $(DWZ_TEST_SOURCES) -O2 -g -lelf -o $@ -Wall -W -DDEVEL \
+	$(CC) $(DWZ_TEST_SOURCES) -O2 -g -lelf -o $@ -DDEVEL \
 	  -D_FILE_OFFSET_BITS=64 -DDWZ_VERSION='"for-test"' -I$(srcdir)
 
 min:
@@ -84,7 +79,7 @@ varval:
 # WARNING: Couldn't find the global config file.
 DEJAGNU ?= /dev/null
 
-check: dwz $(TEST_EXECS)
+check: all $(TEST_EXECS)
 	mkdir -p testsuite-bin
 	cd testsuite-bin; ln -sf $(PWD)/dwz .
 	export DEJAGNU=$(DEJAGNU); \




--- dwz.c.orig	2021-03-09 22:33:26 UTC
+++ dwz.c
@@ -20,11 +20,11 @@
 
 #include <assert.h>

 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -36,7 +36,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/times.h>
 
-#include <obstack.h>
+#include "obstack.h"

 
 #include <gelf.h>
 #include "dwarf2.h"
@@ -165,6 +165,29 @@ report_progress (void)
 /* Where to longjmp on OOM.  */
 static jmp_buf oom_buf;
 
+/* error () wrapper based on the Linux manual page at
+   http://man7.org/linux/man-pages/man3/error.3.html.  */

+    exit (status);
+}
+
 /* Handle OOM situation.  If handling more than one file, we might
    just fail to handle some large file due to OOM, but could very well
    handle other smaller files after it.  */
@@ -13723,7 +13746,7 @@ fdopen_dso (int fd, const char *name)
   int i;
   DSO *dso = NULL;
 

   if (elf == NULL)
     {
       error (0, 0, "cannot open ELF file: %s", elf_errmsg (-1));
@@ -13761,7 +13784,7 @@ fdopen_dso (int fd, const char *name)
       goto error_out;
     }
 

 
   memset (dso, 0, sizeof(DSO));
   dso->elf = elf;
@@ -14258,7 +14281,7 @@ write_dso (DSO *dso, const char *file, struct stat *st
       free (shstrtab);
       return 1;
     }

   for (i = 0; i < ehdr.e_phnum; ++i)
     {
       GElf_Phdr *phdr, phdr_mem;
@@ -14331,7 +14354,7 @@ write_dso (DSO *dso, const char *file, struct stat *st
 	}
     }
 

     {
       error (0, 0, "%s: elf_update failed", dso->filename);
       unlink (file);
@@ -15917,7 +15940,7 @@ optimize_multifile (unsigned int *die_count)
       error (0, 0, "Could not create new ELF headers");
       goto fail;
     }

 
   sha1_init_ctx (&ctx);
   for (i = 0; debug_sections[i].name; i++)
@@ -16010,7 +16033,7 @@ optimize_multifile (unsigned int *die_count)
   data->d_off = 0;
   data->d_align = 1;
 

Lines 1-5 Link Here

(-)files/patch-hashtab.c (-2 / +2 lines)
1	--- hashtab.c.orig 2019-10-02 10:26:03.003230419 -0400	1	--- hashtab.c.orig 2021-03-08 07:56:18 UTC
2	+++ hashtab.c 2020-04-05 14:12:16.089254000 -0400	2	+++ hashtab.c
3	@@ -37,8 +37,8 @@ Boston, MA 02110-1301, USA. */	3	@@ -37,8 +37,8 @@ Boston, MA 02110-1301, USA. */
4	#include <stdio.h>	4	#include <stdio.h>
5	#include "hashtab.h"	5	#include "hashtab.h"

Lines 1-5 Link Here

(-)files/patch-obstack.c (-2 / +2 lines)
1	--- obstack.c.orig 2020-04-05 14:12:16.123238000 -0400	1	--- obstack.c.orig 2021-03-09 22:36:58 UTC
2	+++ obstack.c 2020-04-05 14:12:16.161009000 -0400	2	+++ obstack.c
3	@@ -0,0 +1,511 @@	3	@@ -0,0 +1,511 @@
4	+/* obstack.c - subroutines used implicitly by object stack macros	4	+/* obstack.c - subroutines used implicitly by object stack macros
5	+ Copyright (C) 1988,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.	5	+ Copyright (C) 1988,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.

Lines 1-5 Link Here

(-)files/patch-obstack.h (-2 / +2 lines)
1	--- obstack.h.orig 2020-04-05 14:12:16.193157000 -0400	1	--- obstack.h.orig 2021-03-09 22:36:58 UTC
2	+++ obstack.h 2020-04-05 14:12:16.233805000 -0400	2	+++ obstack.h
3	@@ -0,0 +1,547 @@	3	@@ -0,0 +1,547 @@
4	+/* obstack.h - object stack macros	4	+/* obstack.h - object stack macros
5	+ Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,	5	+ Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,

Lines 1-5 Link Here

(-)files/patch-sha1.c (-2 / +2 lines)
1	--- sha1.c.orig 2019-10-02 10:26:03.003230419 -0400	1	--- sha1.c.orig 2021-03-08 07:56:18 UTC
2	+++ sha1.c 2020-04-05 14:12:16.269464000 -0400	2	+++ sha1.c
3	@@ -27,9 +27,9 @@	3	@@ -27,9 +27,9 @@
4		4
5	#include <stddef.h>	5	#include <stddef.h>

Return to bug 254176

Lines 1-6 Link Here

(-)files/patch-Makefile (-33 / +17 lines)
1	--- Makefile.orig 2019-10-02 10:26:03.011230367 -0400	1	--- Makefile.orig 2021-03-08 07:56:18 UTC
2	+++ Makefile 2020-04-05 14:21:31.102940000 -0400	2	+++ Makefile
3	@@ -1,22 +1,17 @@	3	@@ -1,23 +1,20 @@
4	-ifneq ($(srcdir),)	4	-ifneq ($(srcdir),)
5	-VPATH = $(srcdir)	5	-VPATH = $(srcdir)
6	-else	6	-else
Lines 8-54 Link Here
8	-endif	8	-endif
9	-CFLAGS = -O2 -g	9	-CFLAGS = -O2 -g
10	-DWZ_VERSION := $(shell cat $(srcdir)/VERSION)	10	-DWZ_VERSION := $(shell cat $(srcdir)/VERSION)
11	-override CFLAGS += -Wall -W -D_FILE_OFFSET_BITS=64 -DDWZ_VERSION='"$(DWZ_VERSION)"'	11	-override CFLAGS += -Wall -W -D_FILE_OFFSET_BITS=64 \
		12	- -DDWZ_VERSION='"$(DWZ_VERSION)"' $(shell cat $(srcdir)/COPYRIGHT_YEARS)
12	-prefix = /usr	13	-prefix = /usr
13	+srcdir = .	14	+srcdir = .
		15	+CFLAGS ?= -O2 -g
14	+DWZ_VERSION != cat $(srcdir)/VERSION	16	+DWZ_VERSION != cat $(srcdir)/VERSION
15	+CFLAGS += -D_FILE_OFFSET_BITS=64 -DDWZ_VERSION='"$(DWZ_VERSION)"'	17	+CFLAGS += -DDWZ_VERSION='"$(DWZ_VERSION)"'
16	+prefix = ${PREFIX}	18	+CYEARS != cat $(srcdir)/COPYRIGHT_YEARS
		19	+CFLAGS += $(CYEARS)
		20	+prefix = /usr/local
17	exec_prefix = $(prefix)	21	exec_prefix = $(prefix)
18	bindir = $(exec_prefix)/bin	22	bindir = $(exec_prefix)/bin
19	datarootdir = $(prefix)/share	23	datarootdir = $(prefix)/share
20	-mandir = $(datarootdir)/man	24	-mandir = $(datarootdir)/man
21	-OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o	25	-OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o
22	-dwz: $(OBJECTS)	26	+mandir = $(prefix)/man
		27	+OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o obstack.o
		28	dwz: $(OBJECTS)
23	- $(CC) $(LDFLAGS) -o $@ $^ -lelf	29	- $(CC) $(LDFLAGS) -o $@ $^ -lelf
24	-install: dwz	30	+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lelf
		31	install: dwz
25	- install -D dwz $(DESTDIR)$(bindir)/dwz	32	- install -D dwz $(DESTDIR)$(bindir)/dwz
26	- install -D -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1	33	- install -D -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
27	+mandir = $(prefix)/man	34	+ install dwz $(DESTDIR)$(bindir)/dwz
28	+OBJECTS = dwz.o hashtab.o sha1.o dwarfnames.o obstack.o	35	+ install -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
29	+all: $(OBJECTS)
30	+ $(CC) $(LDFLAGS) -o dwz ${OBJECTS} -lelf
31	+install: all
32	+ install -c -s dwz $(DESTDIR)$(bindir)/dwz
33	+ install -c -m 644 $(srcdir)/dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1
34	clean:	36	clean:
35	rm -f $(OBJECTS) ~ core dwz $(TEST_EXECS) $(DWZ_TEST_SOURCES) \	37	rm -f $(OBJECTS) ~ core dwz $(TEST_EXECS) $(DWZ_TEST_SOURCES) \
36	dwz.log dwz.sum	38	dwz.log dwz.sum
37	@@ -51,7 +46,7 @@ DWZ_TEST_SOURCES := $(patsubst %.o,%-for-test.c,$(OBJE
38	sed 's/__GNUC__/NOT_DEFINED/' $< > $@
39
40	dwz-for-test: $(DWZ_TEST_SOURCES)
41	- $(CC) $(DWZ_TEST_SOURCES) -O2 -g -lelf -o $@ -Wall -W -DDEVEL \
42	+ $(CC) $(DWZ_TEST_SOURCES) -O2 -g -lelf -o $@ -DDEVEL \
43	-D_FILE_OFFSET_BITS=64 -DDWZ_VERSION='"for-test"' -I$(srcdir)
44
45	min:
46	@@ -84,7 +79,7 @@ varval:
47	# WARNING: Couldn't find the global config file.
48	DEJAGNU ?= /dev/null
49
50	-check: dwz $(TEST_EXECS)
51	+check: all $(TEST_EXECS)
52	mkdir -p testsuite-bin
53	cd testsuite-bin; ln -sf $(PWD)/dwz .
54	export DEJAGNU=$(DEJAGNU); \

Lines 1-5 Link Here

(-)files/patch-dwz.c (-16 / +16 lines)
1	--- dwz.c.orig 2019-10-02 10:26:03.015230341 -0400	1	--- dwz.c.orig 2021-03-09 22:33:26 UTC
2	+++ dwz.c 2020-04-05 14:12:16.054408000 -0400	2	+++ dwz.c
3	@@ -20,11 +20,11 @@	3	@@ -20,11 +20,11 @@
4		4
5	#include <assert.h>	5	#include <assert.h>
Lines 13-21 Link Here
13	#include <stdbool.h>	13	#include <stdbool.h>
14	#include <stddef.h>	14	#include <stddef.h>
15	#include <stdint.h>	15	#include <stdint.h>
16	@@ -34,7 +34,7 @@	16	@@ -36,7 +36,7 @@
17	#include <sys/stat.h>
18	#include <sys/types.h>	17	#include <sys/types.h>
		18	#include <sys/times.h>
19		19
20	-#include <obstack.h>	20	-#include <obstack.h>
21	+#include "obstack.h"	21	+#include "obstack.h"
Lines 22-30 Link Here
22		22
23	#include <gelf.h>	23	#include <gelf.h>
24	#include "dwarf2.h"	24	#include "dwarf2.h"
25	@@ -136,6 +136,29 @@ dwz_oom (void)	25	@@ -165,6 +165,29 @@ report_progress (void)
26	longjmp (oom_buf, 1);	26	/* Where to longjmp on OOM. */
27	}	27	static jmp_buf oom_buf;
28		28
29	+/* error () wrapper based on the Linux manual page at	29	+/* error () wrapper based on the Linux manual page at
30	+ http://man7.org/linux/man-pages/man3/error.3.html. */	30	+ http://man7.org/linux/man-pages/man3/error.3.html. */
Lines 49-58 Link Here
49	+ exit (status);	49	+ exit (status);
50	+}	50	+}
51	+	51	+
52	/* General obstack for struct dw_cu, dw_die, also used for temporary	52	/* Handle OOM situation. If handling more than one file, we might
53	vectors. */	53	just fail to handle some large file due to OOM, but could very well
54	static struct obstack ob;	54	handle other smaller files after it. */
55	@@ -10300,7 +10323,7 @@ fdopen_dso (int fd, const char *name)	55	@@ -13723,7 +13746,7 @@ fdopen_dso (int fd, const char *name)
56	int i;	56	int i;
57	DSO *dso = NULL;	57	DSO *dso = NULL;
58		58
Lines 61-67 Link Here
61	if (elf == NULL)	61	if (elf == NULL)
62	{	62	{
63	error (0, 0, "cannot open ELF file: %s", elf_errmsg (-1));	63	error (0, 0, "cannot open ELF file: %s", elf_errmsg (-1));
64	@@ -10338,7 +10361,7 @@ fdopen_dso (int fd, const char *name)	64	@@ -13761,7 +13784,7 @@ fdopen_dso (int fd, const char *name)
65	goto error_out;	65	goto error_out;
66	}	66	}
67		67
Lines 70-76 Link Here
70		70
71	memset (dso, 0, sizeof(DSO));	71	memset (dso, 0, sizeof(DSO));
72	dso->elf = elf;	72	dso->elf = elf;
73	@@ -10829,7 +10852,7 @@ write_dso (DSO dso, const char file, struct stat *st	73	@@ -14258,7 +14281,7 @@ write_dso (DSO dso, const char file, struct stat *st
74	free (shstrtab);	74	free (shstrtab);
75	return 1;	75	return 1;
76	}	76	}
Lines 79-85 Link Here
79	for (i = 0; i < ehdr.e_phnum; ++i)	79	for (i = 0; i < ehdr.e_phnum; ++i)
80	{	80	{
81	GElf_Phdr *phdr, phdr_mem;	81	GElf_Phdr *phdr, phdr_mem;
82	@@ -10902,7 +10925,7 @@ write_dso (DSO dso, const char file, struct stat *st	82	@@ -14331,7 +14354,7 @@ write_dso (DSO dso, const char file, struct stat *st
83	}	83	}
84	}	84	}
85		85
Lines 88-94 Link Here
88	{	88	{
89	error (0, 0, "%s: elf_update failed", dso->filename);	89	error (0, 0, "%s: elf_update failed", dso->filename);
90	unlink (file);	90	unlink (file);
91	@@ -12089,7 +12112,7 @@ optimize_multifile (void)	91	@@ -15917,7 +15940,7 @@ optimize_multifile (unsigned int *die_count)
92	error (0, 0, "Could not create new ELF headers");	92	error (0, 0, "Could not create new ELF headers");
93	goto fail;	93	goto fail;
94	}	94	}
Lines 97-103 Link Here
97		97
98	sha1_init_ctx (&ctx);	98	sha1_init_ctx (&ctx);
99	for (i = 0; debug_sections[i].name; i++)	99	for (i = 0; debug_sections[i].name; i++)
100	@@ -12176,7 +12199,7 @@ optimize_multifile (void)	100	@@ -16010,7 +16033,7 @@ optimize_multifile (unsigned int *die_count)
101	data->d_off = 0;	101	data->d_off = 0;
102	data->d_align = 1;	102	data->d_align = 1;
103		103