Attachment #240331 for bug #268994

Lines 1-5 Link Here

(-)b/devel/binutils/Makefile (-9 / +15 lines)
1	PORTNAME= binutils	1	PORTNAME= binutils
2	PORTVERSION= 2.39	2	DISTVERSION= 2.40
3	PORTEPOCH?= 1	3	PORTEPOCH?= 1
4	CATEGORIES?= devel	4	CATEGORIES?= devel
5	MASTER_SITES= SOURCEWARE/binutils/releases	5	MASTER_SITES= SOURCEWARE/binutils/releases
Lines 16-27 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING3.LIB Link Here
16	BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.so:math/gmp \	16	BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.so:math/gmp \
17	${LOCALBASE}/lib/libmpfr.so:math/mpfr	17	${LOCALBASE}/lib/libmpfr.so:math/mpfr
18		18
		19	LIB_DEPENDS= libzstd.so:archivers/zstd
		20
19	FLAVORS= native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \	21	FLAVORS= native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \
20	avr i386 mingw32 mips mips64 powerpc powerpc64 powerpc64le riscv64 \	22	avr i386 mingw32 mips mips64 powerpc powerpc64 powerpc64le riscv64 \
21	riscv64_none_elf s390x sparc64 riscv32_unknown_elf	23	riscv64_none_elf s390x sparc64 riscv32_unknown_elf
22	FLAVOR?= native	24	FLAVOR?= native
23		25
24	USES= bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:lz	26	USES= bison:alias compiler:env cpe gmake localbase libtool makeinfo perl5 pkgconfig tar:lz
25	USE_PERL5= build	27	USE_PERL5= build
26	CPE_VENDOR= gnu	28	CPE_VENDOR= gnu
27	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
Lines 30-50 GNU_CONFIGURE= yes Link Here
30	CONFIGURE_ARGS+= --disable-werror \	32	CONFIGURE_ARGS+= --disable-werror \
31	--enable-deterministic-archives \	33	--enable-deterministic-archives \
32	--with-sysroot=/ \	34	--with-sysroot=/ \
33	--enable-x86-relax-relocations=no	35	--enable-x86-relax-relocations=no \
34	MAKE_ARGS+= LIBDL=""	36	--with-zstd \
		37	--enable-default-compressed-debug-sections-algorithm=zstd
		38	MAKE_ARGS+= LIBDL="" V=1
35	MAKE_ENV+= ac_cv_func_sbrk=0	39	MAKE_ENV+= ac_cv_func_sbrk=0
36	TEST_TARGET= check	40
		41	# Tests will always fail because --compress-debug-sections is always set to
		42	# zlib-gabi regardless of the compression setting by ./configure.
		43	# TEST_TARGET= check
37		44
38	CONFLICTS= libbfd	45	CONFLICTS= libbfd
39		46
40	OPTIONS_DEFINE= NLS RELRO STATIC	47	OPTIONS_DEFINE= NLS RELRO
41	OPTIONS_SUB= yes	48	OPTIONS_SUB= yes
42	STATIC_PREVENTS= NLS
43		49
44	RELRO_DESC= Enable relocation memory corruption mitigation (-z relro) by default	50	RELRO_DESC= Enable relocation memory corruption mitigation (-z relro) by default
45	RELRO_CONFIGURE_ON= --enable-relro	51	RELRO_CONFIGURE_ON= --enable-relro
46	RELRO_CONFIGURE_OFF= --enable-relro=no	52	RELRO_CONFIGURE_OFF= --enable-relro=no
47	STATIC_LDFLAGS+= -all-static
48	NLS_USES= gettext	53	NLS_USES= gettext
49	NLS_CONFIGURE_ENABLE= nls	54	NLS_CONFIGURE_ENABLE= nls
50		55
Lines 102-108 INFO= as \ Link Here
102	ctf-spec \	107	ctf-spec \
103	gprof \	108	gprof \
104	bfd \	109	bfd \
105	ld	110	ld \
		111	sframe-spec
106	.endif	112	.endif
107		113
108	.include <bsd.port.pre.mk>	114	.include <bsd.port.pre.mk>

Lines 1-3 Link Here

(-)b/devel/binutils/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1660760045	1	TIMESTAMP = 1673799644
2	SHA256 (binutils-2.39.tar.lz) = 5ab51668874d8533201b8edd2edb5e5d81d588205c6da300c8919bd7cf8664e8	2	SHA256 (binutils-2.40.tar.lz) = 48e65ecee1bbcf334d7efb4ea8487fe048dea522e5da3bdf7fa42b1ec779ea33
3	SIZE (binutils-2.39.tar.lz) = 24759528	3	SIZE (binutils-2.40.tar.lz) = 24784952




--- gold/testsuite/Makefile.in.orig	2021-07-02 07:48:07 UTC
+++ gold/testsuite/Makefile.in
@@ -9585,9 +9585,9 @@ uninstall-am:
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	cp -f incr_comdat_test_2_v3.o incr_comdat_test_1_tmp.o
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie incr_comdat_test_1.o incr_comdat_test_1_tmp.o
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_1.o: exception_test_1.cc gcctestdir/as
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -fpic -Wa,-madd-bnd-prefix -o $@ $<
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -fpic -o $@ $<
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_2.o: exception_test_2.cc gcctestdir/as
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -Wa,-madd-bnd-prefix -o $@ $<
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -o $@ $<
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test.stdout: gnu_property_test
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_READELF) -lhSWn $< >$@
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test: gcctestdir/ld gnu_property_a.o gnu_property_b.o gnu_property_c.o




include/diagnostics.h
include/dis-asm.h
%%GOLD%%include/plugin-api.h
include/sframe-api.h
include/sframe.h
include/symcat.h
lib/bfd-plugins/libdep.so
%%NO_STATIC%%lib/bfd-plugins/libdep.so
lib/libbfd.a
lib/libctf-nobfd.a
lib/libctf.a
lib/libopcodes.a
lib/libsframe.a
man/man1/addr2line.1.gz
man/man1/ar.1.gz
man/man1/as.1.gz

%%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo
%%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo
%%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo
%%NLS%%share/locale/ro/LC_MESSAGES/gold.mo
%%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo
%%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo
%%NLS%%share/locale/ru/LC_MESSAGES/bfd.mo
- 

Return to bug 268994

Removed Link Here

(-)a/devel/binutils/files/patch-gold_testsuite_Makefile.in (-14 lines)
1	--- gold/testsuite/Makefile.in.orig 2021-07-02 07:48:07 UTC
2	+++ gold/testsuite/Makefile.in
3	@@ -9585,9 +9585,9 @@ uninstall-am:
4	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ cp -f incr_comdat_test_2_v3.o incr_comdat_test_1_tmp.o
5	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie incr_comdat_test_1.o incr_comdat_test_1_tmp.o
6	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_1.o: exception_test_1.cc gcctestdir/as
7	-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -Wa,-madd-bnd-prefix -o $@ $<
8	+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -o $@ $<
9	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_2.o: exception_test_2.cc gcctestdir/as
10	-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -Wa,-madd-bnd-prefix -o $@ $<
11	+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -o $@ $<
12	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test.stdout: gnu_property_test
13	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_READELF) -lhSWn $< >$@
14	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test: gcctestdir/ld gnu_property_a.o gnu_property_b.o gnu_property_c.o

Lines 23-35 include/ctf.h Link Here

(-)b/devel/binutils/pkg-plist (-3 / +5 lines)
23	include/diagnostics.h	23	include/diagnostics.h
24	include/dis-asm.h	24	include/dis-asm.h
25	%%GOLD%%include/plugin-api.h	25	%%GOLD%%include/plugin-api.h
		26	include/sframe-api.h
		27	include/sframe.h
26	include/symcat.h	28	include/symcat.h
27	%%STATIC%%lib/bfd-plugins/libdep.a	29	lib/bfd-plugins/libdep.so
28	%%NO_STATIC%%lib/bfd-plugins/libdep.so
29	lib/libbfd.a	30	lib/libbfd.a
30	lib/libctf-nobfd.a	31	lib/libctf-nobfd.a
31	lib/libctf.a	32	lib/libctf.a
32	lib/libopcodes.a	33	lib/libopcodes.a
		34	lib/libsframe.a
33	man/man1/addr2line.1.gz	35	man/man1/addr2line.1.gz
34	man/man1/ar.1.gz	36	man/man1/ar.1.gz
35	man/man1/as.1.gz	37	man/man1/as.1.gz
Lines 111-116 man/man1/strip.1.gz Link Here
111	%%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo	113	%%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo
112	%%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo	114	%%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo
113	%%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo	115	%%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo
		116	%%NLS%%share/locale/ro/LC_MESSAGES/gold.mo
114	%%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo	117	%%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo
115	%%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo	118	%%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo
116	%%NLS%%share/locale/ru/LC_MESSAGES/bfd.mo	119	%%NLS%%share/locale/ru/LC_MESSAGES/bfd.mo
117	-